diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
index a3b6f2b..d5687bc 100644
--- a/.github/workflows/default.yml
+++ b/.github/workflows/default.yml
@@ -1,6 +1,15 @@
 ---
 name: Molecule Test
-on: ["push", "pull_request"]
+on:
+  push:
+    branches-ignore:
+      - main
+      - master
+  pull_request:
+    branches:
+      - develop
+      - main
+      - master
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -9,11 +18,18 @@ jobs:
       max-parallel: 4
       matrix:
         molecule_distro:
-          - centos7
-          - centos8
+          # - alpine313
+          # - alpine314
+          # - centos7
+          # - centos8
+          # - debian8
           - debian9
           - debian10
-          - fedora
+          # - debian11
+          # - fedora
+          # - fedora34
+          # - fedora35
+          # - rocky8
           - ubuntu1604
           - ubuntu1804
           - ubuntu2004
diff --git a/.github/workflows/release-galaxy.yml b/.github/workflows/release-galaxy.yml
index 3babab8..1f135bb 100644
--- a/.github/workflows/release-galaxy.yml
+++ b/.github/workflows/release-galaxy.yml
@@ -3,16 +3,11 @@ name: Ansible Galaxy
 on:
   push:
     branches:
-    - main
-    - master
-    - 'releases/**'
-    tags:
-    - '*'
-  pull_request:
-    branches:
-    - main
-    - master
-    - 'releases/**'
+      - main
+      - master
+  release:
+    types:
+      - published
 
 jobs:
   galaxy:
diff --git a/molecule/centos7/molecule.yml b/molecule/centos7/molecule.yml
index a29078b..5bb8b56 100644
--- a/molecule/centos7/molecule.yml
+++ b/molecule/centos7/molecule.yml
@@ -12,12 +12,12 @@ lint: |
   flake8
 platforms:
   - name: centos7
-    image: jrei/systemd-centos:7
+    image: mrlesmithjr/centos:7
+    privileged: true
     command: /usr/sbin/init
-    tmpfs:
-     - /run
-     - /tmp
-     - /var/run
+    # tmpfs:
+    #   - /run
+    #   - /tmp
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
 provisioner:
diff --git a/molecule/centos8/molecule.yml b/molecule/centos8/molecule.yml
index e3bd214..99072ac 100644
--- a/molecule/centos8/molecule.yml
+++ b/molecule/centos8/molecule.yml
@@ -12,12 +12,12 @@ lint: |
   flake8
 platforms:
   - name: centos8
-    image: jrei/systemd-centos:8
+    image: mrlesmithjr/centos:8
+    privileged: true
     command: /usr/sbin/init
-    tmpfs:
-     - /run
-     - /tmp
-     - /var/run
+    # tmpfs:
+    #   - /run
+    #   - /tmp
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
 provisioner:
diff --git a/molecule/debian10/molecule.yml b/molecule/debian10/molecule.yml
index 0887b64..9d1fb0b 100644
--- a/molecule/debian10/molecule.yml
+++ b/molecule/debian10/molecule.yml
@@ -12,7 +12,7 @@ lint: |
   flake8
 platforms:
   - name: debian10
-    image: jrei/systemd-debian:10
+    image: mrlesmithjr/debian:10
     privileged: true
     command: /lib/systemd/systemd
     # tmpfs:
diff --git a/molecule/debian9/molecule.yml b/molecule/debian9/molecule.yml
index e753d47..f9fbe62 100644
--- a/molecule/debian9/molecule.yml
+++ b/molecule/debian9/molecule.yml
@@ -12,7 +12,7 @@ lint: |
   flake8
 platforms:
   - name: debian9
-    image: jrei/systemd-debian:9
+    image: mrlesmithjr/debian:9
     privileged: true
     command: /lib/systemd/systemd
     # tmpfs:
diff --git a/molecule/ubuntu1604/molecule.yml b/molecule/ubuntu1604/molecule.yml
index c5f553b..080cee6 100644
--- a/molecule/ubuntu1604/molecule.yml
+++ b/molecule/ubuntu1604/molecule.yml
@@ -12,7 +12,7 @@ lint: |
   flake8
 platforms:
   - name: ubuntu1604
-    image: jrei/systemd-ubuntu:16.04
+    image: mrlesmithjr/ubuntu:16.04
     privileged: true
     command: /lib/systemd/systemd
     # tmpfs:
diff --git a/molecule/ubuntu1804/molecule.yml b/molecule/ubuntu1804/molecule.yml
index c55881d..8ee0484 100644
--- a/molecule/ubuntu1804/molecule.yml
+++ b/molecule/ubuntu1804/molecule.yml
@@ -12,7 +12,7 @@ lint: |
   flake8
 platforms:
   - name: ubuntu1804
-    image: jrei/systemd-ubuntu:18.04
+    image: mrlesmithjr/ubuntu:18.04
     privileged: true
     command: /lib/systemd/systemd
     # tmpfs:
diff --git a/molecule/ubuntu2004/molecule.yml b/molecule/ubuntu2004/molecule.yml
index a562da2..77a3103 100644
--- a/molecule/ubuntu2004/molecule.yml
+++ b/molecule/ubuntu2004/molecule.yml
@@ -12,7 +12,7 @@ lint: |
   flake8
 platforms:
   - name: ubuntu2004
-    image: jrei/systemd-ubuntu:20.04
+    image: mrlesmithjr/ubuntu:20.04
     privileged: true
     command: /lib/systemd/systemd
     # tmpfs: