diff --git a/charts/reports-server/README.md b/charts/reports-server/README.md
index 0e73cb52..cc42ec4b 100644
--- a/charts/reports-server/README.md
+++ b/charts/reports-server/README.md
@@ -30,7 +30,7 @@ helm install reports-server --namespace reports-server --create-namespace report
 | nameOverride | string | `""` | Name override |
 | fullnameOverride | string | `""` | Full name override |
 | replicaCount | int | `1` | Number of pod replicas |
-| image.registry | string | `"ghcr.io"` | Image registry |
+| image.registry | string | `"reg.nirmata.io"` | Image registry |
 | image.repository | string | `"nirmata/reports-server"` | Image repository |
 | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
 | image.tag | string | `nil` | Image tag (will default to app version if not set) |
@@ -83,9 +83,9 @@ helm install reports-server --namespace reports-server --create-namespace report
 | apiServicesManagement.installApiServices | object | `{"enabled":false,"installEphemeralReportsService":true}` | Install api services in manifest |
 | apiServicesManagement.installApiServices.enabled | bool | `false` | Store reports in reports-server |
 | apiServicesManagement.installApiServices.installEphemeralReportsService | bool | `true` | Store ephemeral reports in reports-server |
-| apiServicesManagement.image.registry | string | `nil` | Image registry |
-| apiServicesManagement.image.repository | string | `"reg.nirmata.io/nirmata/kubectl"` | Image repository |
-| apiServicesManagement.image.tag | string | `"1.32.1"` | Image tag Defaults to `latest` if omitted |
+| apiServicesManagement.image.registry | string | `"ghcr.io"` | Image registry |
+| apiServicesManagement.image.repository | string | `"nirmata/kubectl"` | Image repository |
+| apiServicesManagement.image.tag | string | `"1.30.2"` | Image tag Defaults to `latest` if omitted |
 | apiServicesManagement.image.pullPolicy | string | `nil` | Image pull policy Defaults to image.pullPolicy if omitted |
 | apiServicesManagement.imagePullSecrets | list | `[]` | Image pull secrets |
 | apiServicesManagement.podSecurityContext | object | `{}` | Security context for the pod |
diff --git a/config/install-etcd.yaml b/config/install-etcd.yaml
index 0ebd00f8..70103ead 100644
--- a/config/install-etcd.yaml
+++ b/config/install-etcd.yaml
@@ -280,7 +280,7 @@ spec:
           volumeMounts:
             - mountPath: /tmp
               name: tmp-dir
-          image: "ghcr.io/nirmata/reports-server:latest"
+          image: "reg.nirmata.io/nirmata/reports-server:latest"
           imagePullPolicy: IfNotPresent
           ports:
             - name: https
@@ -351,7 +351,7 @@ spec:
               topologyKey: "kubernetes.io/hostname"
       containers:
       - name: etcd
-        image: reg.nirmata.io/nirmata/etcd:v3.5.18-cve-free
+        image: quay.io/coreos/etcd:v3.5.15
         imagePullPolicy: IfNotPresent
         ports:
         - name: etcd-client
diff --git a/config/install.yaml b/config/install.yaml
index 0ebd00f8..70103ead 100644
--- a/config/install.yaml
+++ b/config/install.yaml
@@ -280,7 +280,7 @@ spec:
           volumeMounts:
             - mountPath: /tmp
               name: tmp-dir
-          image: "ghcr.io/nirmata/reports-server:latest"
+          image: "reg.nirmata.io/nirmata/reports-server:latest"
           imagePullPolicy: IfNotPresent
           ports:
             - name: https
@@ -351,7 +351,7 @@ spec:
               topologyKey: "kubernetes.io/hostname"
       containers:
       - name: etcd
-        image: reg.nirmata.io/nirmata/etcd:v3.5.18-cve-free
+        image: quay.io/coreos/etcd:v3.5.15
         imagePullPolicy: IfNotPresent
         ports:
         - name: etcd-client