diff --git a/.github/workflows/hypershift-assisted-ci.yml b/.github/workflows/hypershift-assisted-ci.yml
index 6c7b64ecb..9fc1c4605 100644
--- a/.github/workflows/hypershift-assisted-ci.yml
+++ b/.github/workflows/hypershift-assisted-ci.yml
@@ -48,8 +48,6 @@ jobs:
          run: |
            curl https://raw.githubusercontent.com/karmab/kcli/main/install.sh | bash
            kcli create sushy-service
-           systemctl daemon-reload
-           systemctl restart ksushy
        - name: Delete old install
          run: |
            kcli delete cluster --yes $CLUSTER || true
diff --git a/.github/workflows/hypershift-assisted-nightly-ci.yml b/.github/workflows/hypershift-assisted-nightly-ci.yml
index de4dff2db..898714ff0 100644
--- a/.github/workflows/hypershift-assisted-nightly-ci.yml
+++ b/.github/workflows/hypershift-assisted-nightly-ci.yml
@@ -22,8 +22,6 @@ jobs:
       run: |
         curl https://raw.githubusercontent.com/karmab/kcli/main/install.sh | bash
         kcli create sushy-service
-        systemctl daemon-reload
-        systemctl restart ksushy
     - name: Delete old install
       run: |
         kcli delete cluster --yes $CLUSTER || true
diff --git a/.github/workflows/sno-ci.yml b/.github/workflows/sno-ci.yml
index 69b31274b..8bbdec445 100644
--- a/.github/workflows/sno-ci.yml
+++ b/.github/workflows/sno-ci.yml
@@ -63,8 +63,6 @@ jobs:
          run: |
            curl https://raw.githubusercontent.com/karmab/kcli/main/install.sh | bash
            kcli create sushy-service
-           systemctl daemon-reload
-           systemctl restart ksushy
        - name: Delete old install
          run: kcli delete cluster --yes $CLUSTER || true
 
diff --git a/.github/workflows/sno-nightly-ci.yml b/.github/workflows/sno-nightly-ci.yml
index f4750a59e..ce2871658 100644
--- a/.github/workflows/sno-nightly-ci.yml
+++ b/.github/workflows/sno-nightly-ci.yml
@@ -23,8 +23,6 @@ jobs:
       run: |
         curl https://raw.githubusercontent.com/karmab/kcli/main/install.sh | bash
         kcli create sushy-service
-        systemctl daemon-reload
-        systemctl restart ksushy
     - name: Delete old install
       run: kcli -C local delete cluster --yes $CLUSTER || true
 
diff --git a/.github/workflows/snoplus.yml b/.github/workflows/snoplus.yml
index 556131081..c6074cb05 100644
--- a/.github/workflows/snoplus.yml
+++ b/.github/workflows/snoplus.yml
@@ -52,8 +52,6 @@ jobs:
          run: |
            curl https://raw.githubusercontent.com/karmab/kcli/main/install.sh | bash
            kcli create sushy-service
-           systemctl daemon-reload
-           systemctl restart ksushy
        - name: Delete old install
          run: kcli delete cluster --yes $CLUSTER || true
 
diff --git a/kcli.spec b/kcli.spec
index 30c99fc70..8bfcf6ad1 100644
--- a/kcli.spec
+++ b/kcli.spec
@@ -57,4 +57,7 @@ rm -rf %{buildroot}
 %attr(0755,root,root) %{_bindir}/ekstoken
 %attr(0755,root,root) %{_bindir}/gketoken
 
+%post
+systemctl is-active --quiet ksushy.service && systemctl daemon-reload && systemctl restart ksushy.service
+
 %changelog