diff --git a/Chart.yaml b/Chart.yaml
index f5c6ecc..0b5f793 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: quay
 description: Red Hat Quay Registry Resources
 type: application
-version: 0.1.2
+version: 0.1.3
 appVersion: "3.9"
 home: https://github.com/validatedpatterns/quay-chart
 maintainers:
diff --git a/README.md b/README.md
index 850bf2d..c2a76eb 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 <!-- markdownlint-disable MD013 -->
 
-![Version: 0.1.2](https://img.shields.io/badge/Version-0.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.9](https://img.shields.io/badge/AppVersion-3.9-informational?style=flat-square)
+![Version: 0.1.3](https://img.shields.io/badge/Version-0.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.9](https://img.shields.io/badge/AppVersion-3.9-informational?style=flat-square)
 
 <!-- markdownlint-enable MD013 -->
 
diff --git a/templates/object-bucket-claim.yaml b/templates/object-bucket-claim.yaml
index 5965a5c..22f79b1 100644
--- a/templates/object-bucket-claim.yaml
+++ b/templates/object-bucket-claim.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ .Values.objectStorage.objectBucketClaim.name }}
   namespace: {{ .Values.quay.namespace }}
   annotations:
-    argocd.argoproj.io/sync-wave: "5"  # Create OBC after NooBaa system is ready
+    argocd.argoproj.io/sync-wave: "36"  # Create OBC after NooBaa system is ready
 spec:
   generateBucketName: {{ .Values.objectStorage.objectBucketClaim.bucketName }}
   storageClassName: {{ .Values.objectStorage.objectBucketClaim.storageClass }}
diff --git a/templates/quay-config-bundle-secret.yaml b/templates/quay-config-bundle-secret.yaml
index bcec831..dd5adc7 100644
--- a/templates/quay-config-bundle-secret.yaml
+++ b/templates/quay-config-bundle-secret.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ .Values.quay.configBundleSecret.name }}
   namespace: {{ .Values.quay.namespace }}
   annotations:
-    argocd.argoproj.io/sync-wave: "7"  # Layer 1: Create base config secret (template)
+    argocd.argoproj.io/sync-wave: "38"  # Layer 1: Create base config secret (template)
 type: Opaque
 stringData:
   config.yaml: |
diff --git a/templates/quay-registry.yaml b/templates/quay-registry.yaml
index 4a7f06f..c58c5f6 100644
--- a/templates/quay-registry.yaml
+++ b/templates/quay-registry.yaml
@@ -4,7 +4,7 @@ metadata:
   name: quay-registry
   namespace: {{ .Values.quay.namespace | default "quay-enterprise" }}
   annotations:
-    argocd.argoproj.io/sync-wave: "10"  # Layer 1: Deploy Quay Registry
+    argocd.argoproj.io/sync-wave: "41"  # Layer 1: Deploy Quay Registry
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
 spec:
   components:
diff --git a/templates/quay-s3-credentials-job.yaml b/templates/quay-s3-credentials-job.yaml
index f1f8c75..1c0cb83 100644
--- a/templates/quay-s3-credentials-job.yaml
+++ b/templates/quay-s3-credentials-job.yaml
@@ -5,7 +5,7 @@ metadata:
   name: quay-s3-credentials-setup
   namespace: {{ .Values.quay.namespace }}
   annotations:
-    argocd.argoproj.io/sync-wave: "8"  # Layer 1: Setup S3 credentials
+    argocd.argoproj.io/sync-wave: "39"  # Layer 1: Setup S3 credentials
 spec:
   template:
     spec:
diff --git a/templates/quay-s3-setup-serviceaccount.yaml b/templates/quay-s3-setup-serviceaccount.yaml
index ec81fb6..7b25701 100644
--- a/templates/quay-s3-setup-serviceaccount.yaml
+++ b/templates/quay-s3-setup-serviceaccount.yaml
@@ -5,7 +5,7 @@ metadata:
   name: quay-s3-setup
   namespace: {{ .Values.quay.namespace }}
   annotations:
-    argocd.argoproj.io/sync-wave: "6"  # Layer 1: Create ServiceAccount/RBAC
+    argocd.argoproj.io/sync-wave: "37"  # Layer 1: Create ServiceAccount/RBAC
   labels:
     app: quay-s3-setup
 ---
@@ -15,7 +15,7 @@ metadata:
   name: quay-s3-setup
   namespace: {{ .Values.quay.namespace }}
   annotations:
-    argocd.argoproj.io/sync-wave: "6"  # Layer 1: Create ServiceAccount/RBAC
+    argocd.argoproj.io/sync-wave: "37"  # Layer 1: Create ServiceAccount/RBAC
 rules:
 # Read template secret and create new secret with real credentials in quay namespace
 - apiGroups: [""]
@@ -33,7 +33,7 @@ metadata:
   name: quay-s3-setup-quay-resources
   namespace: {{ .Values.quay.namespace }}
   annotations:
-    argocd.argoproj.io/sync-wave: "6"  # Layer 1: Create ServiceAccount/RBAC
+    argocd.argoproj.io/sync-wave: "37"  # Layer 1: Create ServiceAccount/RBAC
 rules:
 # ObjectBucketClaim access - OBC is in quay namespace
 - apiGroups: ["objectbucket.io"]
@@ -54,7 +54,7 @@ metadata:
   name: quay-s3-setup
   namespace: {{ .Values.quay.namespace }}
   annotations:
-    argocd.argoproj.io/sync-wave: "6"  # Layer 1: Create ServiceAccount/RBAC
+    argocd.argoproj.io/sync-wave: "37"  # Layer 1: Create ServiceAccount/RBAC
 subjects:
 - kind: ServiceAccount
   name: quay-s3-setup
@@ -70,7 +70,7 @@ metadata:
   name: quay-s3-setup-quay-resources
   namespace: {{ .Values.quay.namespace }}
   annotations:
-    argocd.argoproj.io/sync-wave: "6"  # Layer 1: Create ServiceAccount/RBAC
+    argocd.argoproj.io/sync-wave: "37"  # Layer 1: Create ServiceAccount/RBAC
 subjects:
 - kind: ServiceAccount
   name: quay-s3-setup