diff --git a/scripts/helm/roles/openreplay/tasks/main.yml b/scripts/helm/roles/openreplay/tasks/main.yml
index ab4a7cd60..66d31cf4a 100644
--- a/scripts/helm/roles/openreplay/tasks/main.yml
+++ b/scripts/helm/roles/openreplay/tasks/main.yml
@@ -14,11 +14,11 @@
   shell: |
     kubectl delete -n app secret aws-registry || true
     kubectl create secret -n app docker-registry aws-registry \
-                  --docker-server="{{ ecr_docker_registry_server }}" \
-                  --docker-username="{{ ecr_docker_username }}" \
-                  --docker-password="{{ ecr_docker_password }}" \
+                  --docker-server="{{ docker_registry_url }}" \
+                  --docker-username="{{ docker_registry_username }}" \
+                  --docker-password="{{ docker_registry_password }}" \
                   --docker-email=no@email.local
-  when: ecr_docker_username|length != 0 and ecr_docker_password|length != 0
+  when: docker_registry_username|length != 0 and docker_registry_password|length != 0
 
 # Creating helm override files.
 - name: Creating override files
diff --git a/scripts/helm/roles/openreplay/tasks/pre-check.yaml b/scripts/helm/roles/openreplay/tasks/pre-check.yaml
index abd701b5a..60801192f 100644
--- a/scripts/helm/roles/openreplay/tasks/pre-check.yaml
+++ b/scripts/helm/roles/openreplay/tasks/pre-check.yaml
@@ -5,7 +5,7 @@
     - name: Checking mandatory variables
       fail:
         msg: "Didn't find OpenReplay docker credentials."
-      when: kubeconfig_path|length == 0 or ecr_docker_registry_server|length == 0
+      when: kubeconfig_path|length == 0 or docker_registry_url|length == 0
     - name: Generaing minio access key
       block:
         - name: Generating minio access key
@@ -54,9 +54,9 @@
         msg:
           - Below variables are mandatory. Please make sure it is updated in vars.yaml
           - kubeconfig_path
-          - ecr_docker_username
-          - ecr_docker_password
-          - ecr_docker_registry_server
+          - docker_registry_username
+          - docker_registry_password
+          - docker_registry_url
       failed_when: true
   tags: pre-check
 - name: Creating Nginx SSL certificate
diff --git a/scripts/helm/roles/openreplay/templates/alert.yaml b/scripts/helm/roles/openreplay/templates/alert.yaml
index 0200a406a..1ba439a63 100644
--- a/scripts/helm/roles/openreplay/templates/alert.yaml
+++ b/scripts/helm/roles/openreplay/templates/alert.yaml
@@ -4,9 +4,9 @@ image:
   tag: {{ image_tag }}
 {% endif %}
 
-{% if not (ecr_docker_username is defined and ecr_docker_username and ecr_docker_password is defined and ecr_docker_password) %}
+{% if not (docker_registry_username is defined and docker_registry_username and docker_registry_password is defined and docker_registry_password) %}
 imagePullSecrets: []
 {% endif %}
-{% if not (ecr_docker_username is defined and ecr_docker_username and ecr_docker_password is defined and ecr_docker_password) %}
+{% if not (docker_registry_username is defined and docker_registry_username and docker_registry_password is defined and docker_registry_password) %}
 imagePullSecrets: []
 {% endif %}
diff --git a/scripts/helm/roles/openreplay/templates/assets.yaml b/scripts/helm/roles/openreplay/templates/assets.yaml
index d7be9fa9d..1f21147bb 100644
--- a/scripts/helm/roles/openreplay/templates/assets.yaml
+++ b/scripts/helm/roles/openreplay/templates/assets.yaml
@@ -7,6 +7,6 @@ env:
   AWS_ACCESS_KEY_ID: "{{ minio_access_key }}"
   AWS_SECRET_ACCESS_KEY: "{{ minio_secret_key }}"
 
-{% if not (ecr_docker_username is defined and ecr_docker_username and ecr_docker_password is defined and ecr_docker_password) %}
+{% if not (docker_registry_username is defined and docker_registry_username and docker_registry_password is defined and docker_registry_password) %}
 imagePullSecrets: []
 {% endif %}
diff --git a/scripts/helm/roles/openreplay/templates/chalice.yaml b/scripts/helm/roles/openreplay/templates/chalice.yaml
index 5b757ef65..28325eb64 100644
--- a/scripts/helm/roles/openreplay/templates/chalice.yaml
+++ b/scripts/helm/roles/openreplay/templates/chalice.yaml
@@ -4,7 +4,7 @@ image:
   tag: {{ image_tag }}
 {% endif %}
 
-{% if not (ecr_docker_username is defined and ecr_docker_username and ecr_docker_password is defined and ecr_docker_password) %}
+{% if not (docker_registry_username is defined and docker_registry_username and docker_registry_password is defined and docker_registry_password) %}
 imagePullSecrets: []
 {% endif %}
 env:
diff --git a/scripts/helm/roles/openreplay/templates/db.yaml b/scripts/helm/roles/openreplay/templates/db.yaml
index 0200a406a..1ba439a63 100644
--- a/scripts/helm/roles/openreplay/templates/db.yaml
+++ b/scripts/helm/roles/openreplay/templates/db.yaml
@@ -4,9 +4,9 @@ image:
   tag: {{ image_tag }}
 {% endif %}
 
-{% if not (ecr_docker_username is defined and ecr_docker_username and ecr_docker_password is defined and ecr_docker_password) %}
+{% if not (docker_registry_username is defined and docker_registry_username and docker_registry_password is defined and docker_registry_password) %}
 imagePullSecrets: []
 {% endif %}
-{% if not (ecr_docker_username is defined and ecr_docker_username and ecr_docker_password is defined and ecr_docker_password) %}
+{% if not (docker_registry_username is defined and docker_registry_username and docker_registry_password is defined and docker_registry_password) %}
 imagePullSecrets: []
 {% endif %}
diff --git a/scripts/helm/roles/openreplay/templates/ender.yaml b/scripts/helm/roles/openreplay/templates/ender.yaml
index 560483e94..2d51506ea 100644
--- a/scripts/helm/roles/openreplay/templates/ender.yaml
+++ b/scripts/helm/roles/openreplay/templates/ender.yaml
@@ -4,6 +4,6 @@ image:
   tag: {{ image_tag }}
 {% endif %}
 
-{% if not (ecr_docker_username is defined and ecr_docker_username and ecr_docker_password is defined and ecr_docker_password) %}
+{% if not (docker_registry_username is defined and docker_registry_username and docker_registry_password is defined and docker_registry_password) %}
 imagePullSecrets: []
 {% endif %}
diff --git a/scripts/helm/roles/openreplay/templates/http.yaml b/scripts/helm/roles/openreplay/templates/http.yaml
index d7be9fa9d..1f21147bb 100644
--- a/scripts/helm/roles/openreplay/templates/http.yaml
+++ b/scripts/helm/roles/openreplay/templates/http.yaml
@@ -7,6 +7,6 @@ env:
   AWS_ACCESS_KEY_ID: "{{ minio_access_key }}"
   AWS_SECRET_ACCESS_KEY: "{{ minio_secret_key }}"
 
-{% if not (ecr_docker_username is defined and ecr_docker_username and ecr_docker_password is defined and ecr_docker_password) %}
+{% if not (docker_registry_username is defined and docker_registry_username and docker_registry_password is defined and docker_registry_password) %}
 imagePullSecrets: []
 {% endif %}
diff --git a/scripts/helm/roles/openreplay/templates/integrations.yaml b/scripts/helm/roles/openreplay/templates/integrations.yaml
index 560483e94..2d51506ea 100644
--- a/scripts/helm/roles/openreplay/templates/integrations.yaml
+++ b/scripts/helm/roles/openreplay/templates/integrations.yaml
@@ -4,6 +4,6 @@ image:
   tag: {{ image_tag }}
 {% endif %}
 
-{% if not (ecr_docker_username is defined and ecr_docker_username and ecr_docker_password is defined and ecr_docker_password) %}
+{% if not (docker_registry_username is defined and docker_registry_username and docker_registry_password is defined and docker_registry_password) %}
 imagePullSecrets: []
 {% endif %}
diff --git a/scripts/helm/roles/openreplay/templates/sink.yaml b/scripts/helm/roles/openreplay/templates/sink.yaml
index 560483e94..2d51506ea 100644
--- a/scripts/helm/roles/openreplay/templates/sink.yaml
+++ b/scripts/helm/roles/openreplay/templates/sink.yaml
@@ -4,6 +4,6 @@ image:
   tag: {{ image_tag }}
 {% endif %}
 
-{% if not (ecr_docker_username is defined and ecr_docker_username and ecr_docker_password is defined and ecr_docker_password) %}
+{% if not (docker_registry_username is defined and docker_registry_username and docker_registry_password is defined and docker_registry_password) %}
 imagePullSecrets: []
 {% endif %}
diff --git a/scripts/helm/roles/openreplay/templates/storage.yaml b/scripts/helm/roles/openreplay/templates/storage.yaml
index d7be9fa9d..1f21147bb 100644
--- a/scripts/helm/roles/openreplay/templates/storage.yaml
+++ b/scripts/helm/roles/openreplay/templates/storage.yaml
@@ -7,6 +7,6 @@ env:
   AWS_ACCESS_KEY_ID: "{{ minio_access_key }}"
   AWS_SECRET_ACCESS_KEY: "{{ minio_secret_key }}"
 
-{% if not (ecr_docker_username is defined and ecr_docker_username and ecr_docker_password is defined and ecr_docker_password) %}
+{% if not (docker_registry_username is defined and docker_registry_username and docker_registry_password is defined and docker_registry_password) %}
 imagePullSecrets: []
 {% endif %}
diff --git a/scripts/helm/vars.yaml b/scripts/helm/vars.yaml
index 57baea4a1..bdade016c 100644
--- a/scripts/helm/vars.yaml
+++ b/scripts/helm/vars.yaml
@@ -14,10 +14,10 @@ kubeconfig_path: /home/rajeshr/.kube/config
 ###################
 
 # If you've private registry, please update the details here.
-ecr_docker_username: ""
-ecr_docker_password: ""
-ecr_docker_registry_server: "rg.fr-par.scw.cloud/foss"
-image_tag: v1.0.0
+docker_registry_username: ""
+docker_registry_password: ""
+docker_registry_url: "rg.fr-par.scw.cloud/foss"
+image_tag: "latest"
 
 # This is an optional field. If you want to use proper ssl, then it's mandatory
 # Using which domain name, you'll be accessing OpenReplay