diff --git a/.github/workflows/container-registry-ghcr.yaml b/.github/workflows/container-registry-ghcr.yaml
index 1f2e896..be157ad 100644
--- a/.github/workflows/container-registry-ghcr.yaml
+++ b/.github/workflows/container-registry-ghcr.yaml
@@ -9,8 +9,8 @@
 name: Container Registry GHCR
 "on":
   push:
-    branches:
-      - main
+    tags:
+      - '*'
   workflow_dispatch: {}
 permissions:
   contents: read
@@ -34,8 +34,6 @@ jobs:
         with:
           images: ghcr.io/${{ github.repository }}
           tags: |
-            # https://github.com/docker/metadata-action#typeedge
-            type=edge
             # https://github.com/docker/metadata-action#latest-tag
             type=raw,value=latest,enable={{is_default_branch}}
             # https://github.com/docker/metadata-action#typesemver
diff --git a/Makefile.maker.yaml b/Makefile.maker.yaml
index 3fcfa6f..3f7ffa9 100644
--- a/Makefile.maker.yaml
+++ b/Makefile.maker.yaml
@@ -41,7 +41,6 @@ githubWorkflow:
     enabled: true
     platforms: "linux/amd64,linux/arm64"
     tagStrategy:
-      - edge
       - latest
       - semver
       - sha
diff --git a/charts/openstack-hypervisor-operator/templates/deployment.yaml b/charts/openstack-hypervisor-operator/templates/deployment.yaml
index af49564..b37cfca 100644
--- a/charts/openstack-hypervisor-operator/templates/deployment.yaml
+++ b/charts/openstack-hypervisor-operator/templates/deployment.yaml
@@ -47,8 +47,7 @@ spec:
           value: {{ quote .Values.controllerManager.manager.env.labelSelector }}
         - name: KUBERNETES_CLUSTER_DOMAIN
           value: {{ quote .Values.kubernetesClusterDomain }}
-        image: {{ .Values.controllerManager.manager.image.repository }}:{{ .Values.controllerManager.manager.image.tag
-          | default .Chart.AppVersion }}
+        image: {{ .Values.controllerManager.manager.image.repository }}:{{ .Chart.AppVersion }}
         livenessProbe:
           httpGet:
             path: /healthz