diff --git a/CHANGELOG.md b/CHANGELOG.md
index cdd1d4d21..83fadf30e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@
 - (Feature) (Gateway) Dynamic Configuration
 - (Feature) DebugPackage ArangoRoutes
 - (Feature) (Scheduler) Add Status Conditions
+- (Bugfix) Versioning Alignment
 
 ## [1.2.42](https://github.com/arangodb/kube-arangodb/tree/1.2.42) (2024-07-23)
 - (Maintenance) Go 1.22.4 & Kubernetes 1.29.6 libraries
diff --git a/Makefile b/Makefile
index 6be7f0a72..44c42ed84 100644
--- a/Makefile
+++ b/Makefile
@@ -747,7 +747,10 @@ patch-release: patch-readme patch-examples patch-chart
 
 .PHONY: patch-chart
 patch-chart:
-	$(ROOTDIR)/scripts/patch_chart.sh "$(VERSION_MAJOR_MINOR_PATCH)" "$(OPERATORIMAGE)"
+	$(ROOTDIR)/scripts/patch_chart.sh $(VERSION_MAJOR_MINOR_PATCH)
+
+.PHONY: patch
+patch: patch-chart patch-release patch-examples patch-readme
 
 .PHONY: tidy
 tidy:
diff --git a/README.md b/README.md
index 55c1af195..f6b852ac8 100644
--- a/README.md
+++ b/README.md
@@ -325,9 +325,9 @@ helm install --generate-name https://github.com/arangodb/kube-arangodb/releases/
 ##### Enterprise Edition
 ```bash
 # The following will install the operator and basic CRDs resources.
-helm install --generate-name https://github.com/arangodb/kube-arangodb/releases/download/1.2.41/kube-arangodb-enterprise-1.2.41.tgz
+helm install --generate-name https://github.com/arangodb/kube-arangodb/releases/download/1.2.42/kube-arangodb-enterprise-1.2.42.tgz
 # To use `ArangoLocalStorage`, set field `operator.features.storage` to true
-helm install --generate-name https://github.com/arangodb/kube-arangodb/releases/download/1.2.41/kube-arangodb-enterprise-1.2.41.tgz --set "operator.features.storage=true"
+helm install --generate-name https://github.com/arangodb/kube-arangodb/releases/download/1.2.42/kube-arangodb-enterprise-1.2.42.tgz --set "operator.features.storage=true"
 ```
 
 ### Upgrading the operator using Helm
@@ -364,9 +364,9 @@ helm install --generate-name https://github.com/arangodb/kube-arangodb/releases/
 ##### Enterprise Edition
 ```bash
 # The following will install the operator and basic CRDs resources.
-helm install --generate-name https://github.com/arangodb/kube-arangodb/releases/download/1.2.41/kube-arangodb-enterprise-1.2.41.tgz
+helm install --generate-name https://github.com/arangodb/kube-arangodb/releases/download/1.2.42/kube-arangodb-enterprise-1.2.42.tgz
 # To use `ArangoLocalStorage`, set field `operator.features.storage` to true
-helm install --generate-name https://github.com/arangodb/kube-arangodb/releases/download/1.2.41/kube-arangodb-enterprise-1.2.41.tgz --set "operator.features.storage=true"
+helm install --generate-name https://github.com/arangodb/kube-arangodb/releases/download/1.2.42/kube-arangodb-enterprise-1.2.42.tgz --set "operator.features.storage=true"
 ```
 
 ## Building
diff --git a/chart/kube-arangodb-enterprise-arm64/values.yaml b/chart/kube-arangodb-enterprise-arm64/values.yaml
index 0ec2b19b7..96f6e6b16 100644
--- a/chart/kube-arangodb-enterprise-arm64/values.yaml
+++ b/chart/kube-arangodb-enterprise-arm64/values.yaml
@@ -1,10 +1,10 @@
 operator:
-  image: arangodb/kube-arangodb:1.2.42
+  image: arangodb/kube-arangodb-enterprise:1.2.42
   imagePullPolicy: IfNotPresent
   imagePullSecrets: []
   scope: legacy
   architectures:
-    - amd64
+    - arm64
   debug: false
   args: []
   service:
diff --git a/chart/kube-arangodb-enterprise/values.yaml b/chart/kube-arangodb-enterprise/values.yaml
index f509a510f..92ae2b0a1 100644
--- a/chart/kube-arangodb-enterprise/values.yaml
+++ b/chart/kube-arangodb-enterprise/values.yaml
@@ -1,10 +1,10 @@
 operator:
-  image: arangodb/kube-arangodb:1.2.42
+  image: arangodb/kube-arangodb-enterprise:1.2.42
   imagePullPolicy: IfNotPresent
   imagePullSecrets: []
   scope: legacy
   architectures:
-    - arm64
+    - amd64
   debug: false
   args: []
   service:
diff --git a/scripts/patch_chart.sh b/scripts/patch_chart.sh
index 47371a970..edf8686a4 100755
--- a/scripts/patch_chart.sh
+++ b/scripts/patch_chart.sh
@@ -4,7 +4,6 @@
 # version.
 
 VERSION=$1
-IMAGE=$2
 
 if [ -z $VERSION ]; then
     echo "Specify a version argument"
@@ -20,6 +19,7 @@ function replaceInFile {
 for f in kube-arangodb kube-arangodb-enterprise kube-arangodb-arm64 kube-arangodb-enterprise-arm64 kube-arangodb-crd; do
     replaceInFile "s@^version: .*\$@version: ${VERSION}@g" "chart/${f}/Chart.yaml"
     if [[ -f "chart/${f}/values.yaml" ]]; then
-        replaceInFile "s@^  image: .*\$@  image: ${IMAGE}@g" "chart/${f}/values.yaml"
+        replaceInFile "s@^  image: arangodb/kube-arangodb:[[:digit:]].*\$@  image: arangodb/kube-arangodb:${VERSION}@g" "chart/${f}/values.yaml"
+        replaceInFile "s@^  image: arangodb/kube-arangodb-enterprise:[[:digit:]].*\$@  image: arangodb/kube-arangodb-enterprise:${VERSION}@g" "chart/${f}/values.yaml"
     fi
 done
\ No newline at end of file
diff --git a/scripts/patch_examples.sh b/scripts/patch_examples.sh
index 58f6cc82a..117ab3fea 100755
--- a/scripts/patch_examples.sh
+++ b/scripts/patch_examples.sh
@@ -9,7 +9,7 @@ if [ -z $VERSION ]; then
     exit 1
 fi
 
-ARANGODB_VERSION=3.10.8
+ARANGODB_VERSION=3.12.2
 
 function replaceInFile {
     local EXPR=$1
diff --git a/scripts/patch_readme.sh b/scripts/patch_readme.sh
index ca77aee70..1c6af7e59 100755
--- a/scripts/patch_readme.sh
+++ b/scripts/patch_readme.sh
@@ -35,3 +35,4 @@ replaceInFile "s@^kubectl apply -f https://raw.githubusercontent.com/arangodb/ku
 replaceInFile "s@https://github\.com/arangodb/kube-arangodb/releases/download/.*/kube-arangodb-crd-[[:digit:]].*\.tgz@https://github.com/arangodb/kube-arangodb/releases/download/${VERSION}/kube-arangodb-crd-${VERSION}.tgz@g" ${f}
 replaceInFile "s@https://github\.com/arangodb/kube-arangodb/releases/download/.*/kube-arangodb-enterprise-[[:digit:]].*\.tgz@https://github.com/arangodb/kube-arangodb/releases/download/${VERSION}/kube-arangodb-enterprise-${VERSION}.tgz@g" ${f}
 replaceInFile "s@https://github\.com/arangodb/kube-arangodb/releases/download/.*/kube-arangodb-[[:digit:]].*\.tgz@https://github.com/arangodb/kube-arangodb/releases/download/${VERSION}/kube-arangodb-${VERSION}.tgz@g" ${f}
+replaceInFile "s@https://github\.com/arangodb/kube-arangodb/releases/download/.*/kube-arangodb-enterprise-[[:digit:]].*\.tgz@https://github.com/arangodb/kube-arangodb/releases/download/${VERSION}/kube-arangodb-enterprise-${VERSION}.tgz@g" ${f}