diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml
index cf2c15e..e1a9c0a 100644
--- a/.github/workflows/molecule.yml
+++ b/.github/workflows/molecule.yml
@@ -14,7 +14,7 @@ jobs:
 
     strategy:
       matrix:
-        distro: [rockylinux8]
+        distro: [rockylinux8, rockylinux9, ubuntu2204]
         scenario: [default, renew, ca-renew]
     steps:
       - name: Check out code
diff --git a/molecule/ca-renew/verify.yml b/molecule/ca-renew/verify.yml
index 39412e2..beb2c9b 100644
--- a/molecule/ca-renew/verify.yml
+++ b/molecule/ca-renew/verify.yml
@@ -125,7 +125,7 @@
 
     - name: Register notAfter of client certificate
       shell: >
-        set -o pipefail &&
+        if test -n "$(ps -p $$ | grep bash)"; then set -o pipefail; fi;
         openssl x509
         -noout
         -dates
@@ -140,7 +140,7 @@
 
     - name: Register notAfter of server certificate
       shell: >
-        set -o pipefail &&
+        if test -n "$(ps -p $$ | grep bash)"; then set -o pipefail; fi;
         openssl x509
         -noout
         -dates
@@ -155,7 +155,7 @@
 
     - name: Register notAfter of etcd certificate
       shell: >
-        set -o pipefail &&
+        if test -n "$(ps -p $$ | grep bash)"; then set -o pipefail; fi;
         openssl x509
         -noout
         -dates
@@ -170,7 +170,7 @@
 
     - name: Register notAfter of etcd server certificate
       shell: >
-        set -o pipefail &&
+        if test -n "$(ps -p $$ | grep bash)"; then set -o pipefail; fi;
         openssl x509
         -noout
         -dates
@@ -189,7 +189,7 @@
 
     - name: Register notAfter of CA certificate
       shell: >
-        set -o pipefail &&
+        if test -n "$(ps -p $$ | grep bash)"; then set -o pipefail; fi;
         openssl x509
         -noout
         -dates
diff --git a/molecule/renew/verify.yml b/molecule/renew/verify.yml
index 1805a02..147a8a8 100644
--- a/molecule/renew/verify.yml
+++ b/molecule/renew/verify.yml
@@ -124,7 +124,7 @@
 
     - name: Register notAfter of client certificate
       shell: >
-        set -o pipefail &&
+        if test -n "$(ps -p $$ | grep bash)"; then set -o pipefail; fi;
         openssl x509
         -noout
         -dates
@@ -139,7 +139,7 @@
 
     - name: Register notAfter of server certificate
       shell: >
-        set -o pipefail &&
+        if test -n "$(ps -p $$ | grep bash)"; then set -o pipefail; fi;
         openssl x509
         -noout
         -dates
@@ -154,7 +154,7 @@
 
     - name: Register notAfter of etcd certificate
       shell: >
-        set -o pipefail &&
+        if test -n "$(ps -p $$ | grep bash)"; then set -o pipefail; fi;
         openssl x509
         -noout
         -dates
@@ -169,7 +169,7 @@
 
     - name: Register notAfter of etcd server certificate
       shell: >
-        set -o pipefail &&
+        if test -n "$(ps -p $$ | grep bash)"; then set -o pipefail; fi;
         openssl x509
         -noout
         -dates
@@ -188,7 +188,7 @@
 
     - name: Register notAfter of CA certificate
       shell: >
-        set -o pipefail &&
+        if test -n "$(ps -p $$ | grep bash)"; then set -o pipefail; fi;
         openssl x509
         -noout
         -dates