diff --git a/.ansible-collection-microsoft-sql.metadata b/.ansible-collection-microsoft-sql.metadata
index 9b2f657..5d42a1e 100644
--- a/.ansible-collection-microsoft-sql.metadata
+++ b/.ansible-collection-microsoft-sql.metadata
@@ -1,2 +1,2 @@
 06bdf4fd47cd57661f657fa4f29ec3031198ba11 SOURCES/auto-maintenance-73800682a3293ef5ab5ed5880329ce792cd34bbf.tar.gz
-8c3c482dcb82d92b662a8045f10e1f5f03a65f43 SOURCES/mssql-1.3.0.tar.gz
+178972d35f088095707890c603410276418b8800 SOURCES/mssql-1.3.0.tar.gz
diff --git a/SPECS/ansible-collection-microsoft-sql.spec b/SPECS/ansible-collection-microsoft-sql.spec
index fa45993..5a27e85 100644
--- a/SPECS/ansible-collection-microsoft-sql.spec
+++ b/SPECS/ansible-collection-microsoft-sql.spec
@@ -25,7 +25,7 @@ Name: ansible-collection-microsoft-sql
 Url: https://github.com/linux-system-roles/mssql
 Summary: The Ansible collection for Microsoft SQL Server management
 Version: 1.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: MIT
 
@@ -161,13 +161,11 @@ cp %{rolename}/.collection/galaxy.yml ./
 mv galaxy.yml.tmp galaxy.yml
 
 %if 0%{?rhel}
-# Replace fedora.linux_system_roles with redhat.rhel_system_roles
-sed -i 's/fedora\.linux_system_roles/redhat.rhel_system_roles/g' \
-    %{rolename}/CHANGELOG.md \
-    %{rolename}/README.md \
-    %{rolename}/tasks/*.yml \
-    %{rolename}/tests/*.yml \
-    %{rolename}/meta/*.yml
+# Replace "fedora.linux_system_roles" with "redhat.rhel_system_roles"
+# This is for the "roles calling other roles" case
+find %{rolename} -type f -exec \
+     sed -e "s/fedora[.]linux_system_roles[.]/redhat.rhel_system_roles./g" \
+         -i {} \;
 %endif
 
 # Convert to the collection format
@@ -181,6 +179,11 @@ python3 lsr_role2collection.py --role "%{rolename}" \
     --new-role "%{collection_rolename}" \
     --meta-runtime lsr_role2collection/runtime.yml
 
+# Replace remnants of "linux-system-roles.mssql" with collection FQDN
+find .collections/ansible_collections/%{collection_namespace}/%{collection_name}/ -type f -exec \
+     sed -e "s/linux-system-roles[.]%{rolename}\\>/%{collection_namespace}.%{collection_name}.%{collection_rolename}/g" \
+         -i {} \;
+
 # removing dot files/dirs
 rm -r .collections/ansible_collections/%{collection_namespace}/%{collection_name}/.[A-Za-z]*
 rm -r .collections/ansible_collections/%{collection_namespace}/%{collection_name}/tests/%{collection_rolename}/.[A-Za-z]*
@@ -202,8 +205,9 @@ mkdir -p %{buildroot}%{ansible_roles_dir}
 
 # Copy role in legacy format and rename rolename in tests
 cp -pR "%{rolename}" "%{buildroot}%{ansible_roles_dir}/%{legacy_rolename}"
-sed -i "s/linux-system-roles\.%{rolename}/microsoft\.%{legacy_rolename}/g" \
-    %{buildroot}%{ansible_roles_dir}/%{legacy_rolename}/tests/*.yml
+find %{buildroot}%{ansible_roles_dir}/%{legacy_rolename} -type f -exec \
+     sed -e "s/linux-system-roles\.%{rolename}/%{legacy_rolename}/g" \
+         -i {} \;
 
 # Copy README, COPYING, and LICENSE files to the corresponding directories
 mkdir -p %{buildroot}%{_pkglicensedir}
@@ -343,6 +347,13 @@ find %{buildroot}%{ansible_roles_dir} -mindepth 1 -maxdepth 1 | \
 %endif
 
 %changelog
+* Thu Feb 16 2023 Sergei Petrosian <spetrosi@redhat.com> - 1.3.0-2
+- Replace fedora.linux_system_roles/redhat.rhel_system_roles and
+  linux-system-roles.mssql with microsoft.sql.server in the role.
+  Resolves: rhbz#2129106
+- Use latest 1.3.0 to fix ad_Integration issues
+  Resolves: rhbz#2163696
+
 * Wed Feb 1 2023 Sergei Petrosian <spetrosi@redhat.com> - 1.3.0-1
 - Keep spec consistent with linux-system-roles
   - Return conditionals related to EL to keep up- and downstream consistent