diff --git a/linux-system-roles.spec b/linux-system-roles.spec
index 7510fef..cb761fb 100644
--- a/linux-system-roles.spec
+++ b/linux-system-roles.spec
@@ -21,8 +21,8 @@ Name: linux-system-roles
 %endif
 Url: https://github.com/linux-system-roles
 Summary: Set of interfaces for unified system management
-Version: 1.2.3
-Release: 3%{?dist}
+Version: 1.3.0
+Release: 1%{?dist}
 
 #Group: Development/Libraries
 License: GPLv3+ and MIT and BSD
@@ -107,77 +107,82 @@ BuildRequires: ansible >= 2.9.10
 %%global rolestodir %%{?rolestodir} %%{roletodir%{1}}
 }
 
-%defcommit 1 6704b330fc3e6220ab4c00268d4c972b7c042886
+#%%defcommit 1 14314822b529520ac12964e0d2938c4bb18ab895
 %global rolename1 postfix
-#%%deftag 1 0.1
+%deftag 1 1.0.0
 
-%defcommit 2 62ff85a9c605a7c281d4dfb5a047f322245c63b5
+#%%defcommit 2 9fe6eb36772e83b53dcfb8ceb73608fd4f72eeda
 %global rolename2 selinux
-#%%deftag 2 1.1.1
+%deftag 2 1.2.3
 
-%defcommit 3 8db8f9ed9088432bac7abf68f1b284475a3baa38
+#%%defcommit 3 8db8f9ed9088432bac7abf68f1b284475a3baa38
 %global rolename3 timesync
-#%%deftag 3 1.0.0
+%deftag 3 1.5.0
 
-%defcommit 4 02fc72b482e165472624b2f68eecd2ddce1d93b1
+#%%defcommit 4 02fc72b482e165472624b2f68eecd2ddce1d93b1
 %global rolename4 kdump
-#%%deftag 4 1.0.0
+%deftag 4 1.0.5
 
-%defcommit 5 6fdac168a9406bbe2988245a2a77cfc48dfa51e0
+%defcommit 5 85b75b6c8cca13f40fb356540bd8aa05d5ca820f
 %global rolename5 network
 #%%deftag 5 1.0.0
 
-%defcommit 6 b3b456183edb7b8aa6ceff7ce667d8e22009ef6a
+#%%defcommit 6 b3b456183edb7b8aa6ceff7ce667d8e22009ef6a
 %global rolename6 storage
-#%%deftag 6 1.2.2
+%deftag 6 1.3.1
 
-%defcommit 7 384718b020c50ae274230e9dc59fc11620e03537
+#%%defcommit 7 0673d842fb32c437501e2aada2e38921da98e115
 %global rolename7 metrics
-#%%deftag 7 0.1.0
+%deftag 7 1.2.3
 
-%defcommit 8 2b9e53233ee3a68bdb532e62f289733e436a6106
+#%%defcommit 8 2b9e53233ee3a68bdb532e62f289733e436a6106
 %global rolename8 tlog
-#%%deftag 8 1.1.0
+%deftag 8 1.1.1
 
-%defcommit 9 9373303b98e09ef38df7afc8d06e5e55812096c7
+#%%defcommit 9 9373303b98e09ef38df7afc8d06e5e55812096c7
 %global rolename9 kernel_settings
-#%%deftag 9 1.0.1
+%deftag 9 1.0.3
 
-%defcommit 10 20dd3e5520ca06dcccaa9b3f1fb428d055e0c23f
+#%%defcommit 10 20dd3e5520ca06dcccaa9b3f1fb428d055e0c23f
 %global rolename10 logging
-#%%deftag 10 0.2.0
+%deftag 10 1.3.1
 
-%defcommit 11 c57d0b1f3384c525738fa26ba4bdca485e162567
+#%%defcommit 11 c57d0b1f3384c525738fa26ba4bdca485e162567
 %global rolename11 nbde_server
-#%%deftag 11 1.0.1
+%deftag 11 1.0.3
 
-%defcommit 12 bef2fad5e365712d1f40e53662490ba2550a253f
+#%%defcommit 12 bef2fad5e365712d1f40e53662490ba2550a253f
 %global rolename12 nbde_client
-#%%deftag 12 1.0.1
+%deftag 12 1.0.4
 
-%defcommit 13 310fc53db04e8d3134524afb7a89b0477a2ffb83
+#%%defcommit 13 310fc53db04e8d3134524afb7a89b0477a2ffb83
 %global rolename13 certificate
-#%%deftag 13 1.0.1
+%deftag 13 1.0.3
 
-%defcommit 14 b2a9857ac661fa32e66666e444b73bfdb34cdf95
+#%%defcommit 14 b2a9857ac661fa32e66666e444b73bfdb34cdf95
 %global rolename14 crypto_policies
+%deftag 14 1.0.1
 
 %global forgeorg15 https://github.com/willshersystems
 %global repo15 ansible-sshd
 %global rolename15 sshd
-%defcommit 15 32f9d0dda5a801cbefad09214ec2d88b6838b943
+#%%defcommit 15 32f9d0dda5a801cbefad09214ec2d88b6838b943
+%deftag 15 v0.13.0
 
-%defcommit 16 59b9fd7b25607d8bd33bdb082748955f2652846a
+#%%defcommit 16 59b9fd7b25607d8bd33bdb082748955f2652846a
 %global rolename16 ssh
+%deftag 16 1.0.2
 
-%defcommit 17 6e1e37f0097db23c8b804e520e272575e9714d5f
+#%%defcommit 17 f901239cb91878719c9e7461760ef8d4789d626d
 %global rolename17 ha_cluster
+%deftag 17 1.1.1
 
-%defcommit 18 5f6cb73e6753fbdbb219b7d3079f0378b2d3bdb3
+#%%defcommit 18 5f6cb73e6753fbdbb219b7d3079f0378b2d3bdb3
 %global rolename18 vpn
+%deftag 18 1.1.0
 
-%global mainid 4e47b3809a4e6c1dcd9af57fee117d6df0c261ad
-Source: %{url}auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar.gz
+%global mainid ec364d2e0bd422b69f34871a1188114f368097a0
+Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar.gz
 Source1: %{archiveurl1}
 Source2: %{archiveurl2}
 Source3: %{archiveurl3}
@@ -266,7 +271,17 @@ Collection artifact for %{name}. This package contains %{collection_namespace}-%
 
 declare -A ROLESTODIR=(%{rolestodir})
 for rolename in %{rolenames}; do
-    mv "${ROLESTODIR[${rolename}]}" ${rolename}
+    dir_from_archive="${ROLESTODIR[${rolename}]}"
+    if [ ! -d "$dir_from_archive" ]; then
+        # ansible-sshd uses tags like vX.Y.Z
+        # using the github archive/ link with a tag like this strips
+        # the leading v from the tag used to construct the directory
+        # name in the archive
+        if [[ "$dir_from_archive" =~ %{repo15}-v([0-9]+[.][0-9]+.*) ]]; then
+            dir_from_archive="%{repo15}-${BASH_REMATCH[1]}"
+        fi
+    fi
+    mv "$dir_from_archive" ${rolename}
 done
 
 cd %{rolename5}
@@ -370,7 +385,7 @@ sed -i -e '/^## Table of Contents/,/^## Background/d' \
 # Remove internal links from readme files
 # They are not rendered properly on AH.
 for role in %{rolenames}; do
-    sed -r -i -e 's/\[([^[]+)\]\(#.*\)/\1/g' \
+    sed -r -i -e 's/\[([^[]+)\]\(#[^)]+\)/\1/g' \
     .collections/ansible_collections/%{collection_namespace}/%{collection_name}/roles/$role/README.md
 done
 
@@ -598,6 +613,44 @@ fi
 %endif
 
 %changelog
+* Wed Jun 23 2021 Rich Megginson <rmeggins@redhat.com> - 1.3.0-1
+- ha_cluster - add pacemaker resources configuration
+  Resolves rhbz#1978726
+- ha_cluster - code cleanup
+  Resolves rhbz#1978731
+- Postfix RHEL system role README.md missing variables under the "Role Variables" section
+  Resolves rhbz#1978734
+- logging README.html examples are rendered incorrectly
+  Resolves rhbz#1978758
+- make postfix role idempotent - round 2
+  Resolves rhbz#1978760
+- selinux task for semanage says Fedora in name but also runs on RHEL/CentOS 8
+  Resolves rhbz#1978740
+- metrics role task to enable logging for targeted hosts not working
+  Resolves rhbz#1978746
+- network - Only show stderr_lines by default
+  Resolves rhbz#1978731
+- storage - LVMVDO support
+  Resolves rhbz#1978488
+- storage - fix several linter issues
+  Resolves rhbz#1978731
+- ssh - Fix variable precedence when invoked through roles
+  Resolves rhbz#1978745
+- ssh - Update configuration options list for OpenSSH 8.6
+  Resolves rhbz#1978731
+- sshd - Fix variable precedence when invoked through roles
+  Resolves rhbz#1978745
+- sshd - Update configuration options list for OpenSSH 8.6
+  Resolves rhbz#1978731
+- sshd - support for appending a snippet to configuration file
+  Resolves rhbz#1978752
+- timesync - add NTS support
+  Resolves rhbz#1978753
+- timesync - rebase to latest
+  Resolves rhbz#1978731
+- nbde_client - rebase to latest
+  Resolves rhbz#1978731
+
 * Thu Jun 17 2021 Sergei Petrosian <spetrosi@redhat.com> - 1.2.3-3
 - Make the ansible_collection_files macro defined in Fedora automatically and
   in RHEL manually consistent - having slash at the end to clean double-slashes