diff --git a/.github/workflows/testing.yaml b/.github/workflows/testing.yaml
index 17777d0..f18e2ad 100644
--- a/.github/workflows/testing.yaml
+++ b/.github/workflows/testing.yaml
@@ -44,7 +44,7 @@ env:
 jobs:
   deploy_to_testing:
     name: Deploy testing server to google kubernetes engine
-    if: ${{ github.ref == 'refs/heads/develop'}}
+    if: ${{ github.ref == 'refs/heads/celery-fixes'}}
     runs-on: ubuntu-latest
     environment:
       name: test
diff --git a/deploy/charts/openconceptlab/templates/celery/ocl_celery_bulk_import.yaml b/deploy/charts/openconceptlab/templates/celery/ocl_celery_bulk_import.yaml
index b66816b..906f32a 100644
--- a/deploy/charts/openconceptlab/templates/celery/ocl_celery_bulk_import.yaml
+++ b/deploy/charts/openconceptlab/templates/celery/ocl_celery_bulk_import.yaml
@@ -51,4 +51,43 @@ spec:
               value: {{ .Values.app.container.env.redisPort | quote }}
 
             - name: DEBUG
-              value: {{ .Values.app.container.env.debug | quote }}
\ No newline at end of file
+              value: {{ .Values.app.container.env.debug | quote }}
+
+            - name: DB_HOST
+              value: {{ .Values.app.container.env.dbHost | quote }}
+
+            - name: DB_PORT
+              value: {{ .Values.app.container.env.dbPort | quote }}
+
+            - name: DB
+              value: {{ .Values.app.container.env.db | quote }}
+            
+            - name: DB_PASSWORD
+              value: {{ .Values.app.container.env.dbPassword | quote }}
+
+            - name: API_HOST
+              value: {{ .Values.app.container.env.redisHost | quote }}
+
+            - name: API_PORT
+              value: {{ .Values.app.container.env.redisPort | quote }}
+
+        - name: cloudsql-proxy
+          image: gcr.io/cloudsql-docker/gce-proxy:1.33.2
+          command: [
+            "/cloud_sql_proxy",
+            "-instances={{ .Values.app.container.env.databaseInstanceConnectionName }}=tcp:5432",
+            "-credential_file={{ .Values.app.container.env.googleApplicationCredentialsSecret.filePath }}"]
+
+          securityContext:
+            runAsNonRoot: false
+            allowPrivilegeEscalation: false
+
+          volumeMounts:
+          - name: {{ .Values.app.container.env.googleApplicationCredentialsSecret.name }}
+            mountPath: {{ .Values.app.container.env.googleApplicationCredentialsSecret.mountPath }}
+            readOnly: true
+    
+      volumes:
+        - name: {{ .Values.app.container.env.googleApplicationCredentialsSecret.name }}
+          secret:
+            secretName: {{ .Values.app.container.env.googleApplicationCredentialsSecret.name }}
\ No newline at end of file
diff --git a/deploy/charts/openconceptlab/templates/celery/ocl_celery_bulk_import_0_1.yaml b/deploy/charts/openconceptlab/templates/celery/ocl_celery_bulk_import_0_1.yaml
index 3f05259..c0c538a 100644
--- a/deploy/charts/openconceptlab/templates/celery/ocl_celery_bulk_import_0_1.yaml
+++ b/deploy/charts/openconceptlab/templates/celery/ocl_celery_bulk_import_0_1.yaml
@@ -51,4 +51,43 @@ spec:
               value: {{ .Values.app.container.env.redisPort | quote }}
 
             - name: DEBUG
-              value: {{ .Values.app.container.env.debug | quote }}
\ No newline at end of file
+              value: {{ .Values.app.container.env.debug | quote }}
+
+            - name: DB_HOST
+              value: {{ .Values.app.container.env.dbHost | quote }}
+
+            - name: DB_PORT
+              value: {{ .Values.app.container.env.dbPort | quote }}
+
+            - name: DB
+              value: {{ .Values.app.container.env.db | quote }}
+            
+            - name: DB_PASSWORD
+              value: {{ .Values.app.container.env.dbPassword | quote }}
+
+            - name: API_HOST
+              value: {{ .Values.app.container.env.redisHost | quote }}
+
+            - name: API_PORT
+              value: {{ .Values.app.container.env.redisPort | quote }}
+
+        - name: cloudsql-proxy
+          image: gcr.io/cloudsql-docker/gce-proxy:1.33.2
+          command: [
+            "/cloud_sql_proxy",
+            "-instances={{ .Values.app.container.env.databaseInstanceConnectionName }}=tcp:5432",
+            "-credential_file={{ .Values.app.container.env.googleApplicationCredentialsSecret.filePath }}"]
+
+          securityContext:
+            runAsNonRoot: false
+            allowPrivilegeEscalation: false
+
+          volumeMounts:
+          - name: {{ .Values.app.container.env.googleApplicationCredentialsSecret.name }}
+            mountPath: {{ .Values.app.container.env.googleApplicationCredentialsSecret.mountPath }}
+            readOnly: true
+    
+      volumes:
+        - name: {{ .Values.app.container.env.googleApplicationCredentialsSecret.name }}
+          secret:
+            secretName: {{ .Values.app.container.env.googleApplicationCredentialsSecret.name }}
\ No newline at end of file
diff --git a/deploy/charts/openconceptlab/templates/celery/ocl_celery_bulk_import_2_3.yaml b/deploy/charts/openconceptlab/templates/celery/ocl_celery_bulk_import_2_3.yaml
index 142262e..d0b95ea 100644
--- a/deploy/charts/openconceptlab/templates/celery/ocl_celery_bulk_import_2_3.yaml
+++ b/deploy/charts/openconceptlab/templates/celery/ocl_celery_bulk_import_2_3.yaml
@@ -51,4 +51,44 @@ spec:
               value: {{ .Values.app.container.env.redisPort | quote }}
 
             - name: DEBUG
-              value: {{ .Values.app.container.env.debug | quote }}
\ No newline at end of file
+              value: {{ .Values.app.container.env.debug | quote }}
+
+            - name: DB_HOST
+              value: {{ .Values.app.container.env.dbHost | quote }}
+
+            - name: DB_PORT
+              value: {{ .Values.app.container.env.dbPort | quote }}
+
+            - name: DB
+              value: {{ .Values.app.container.env.db | quote }}
+            
+            - name: DB_PASSWORD
+              value: {{ .Values.app.container.env.dbPassword | quote }}
+
+            - name: API_HOST
+              value: {{ .Values.app.container.env.redisHost | quote }}
+
+            - name: API_PORT
+              value: {{ .Values.app.container.env.redisPort | quote }}
+
+      
+        - name: cloudsql-proxy
+          image: gcr.io/cloudsql-docker/gce-proxy:1.33.2
+          command: [
+            "/cloud_sql_proxy",
+            "-instances={{ .Values.app.container.env.databaseInstanceConnectionName }}=tcp:5432",
+            "-credential_file={{ .Values.app.container.env.googleApplicationCredentialsSecret.filePath }}"]
+
+          securityContext:
+            runAsNonRoot: false
+            allowPrivilegeEscalation: false
+
+          volumeMounts:
+          - name: {{ .Values.app.container.env.googleApplicationCredentialsSecret.name }}
+            mountPath: {{ .Values.app.container.env.googleApplicationCredentialsSecret.mountPath }}
+            readOnly: true
+        
+      volumes:
+        - name: {{ .Values.app.container.env.googleApplicationCredentialsSecret.name }}
+          secret:
+            secretName: {{ .Values.app.container.env.googleApplicationCredentialsSecret.name }}
\ No newline at end of file
diff --git a/deploy/charts/openconceptlab/templates/celery/ocl_celery_concurrent.yaml b/deploy/charts/openconceptlab/templates/celery/ocl_celery_concurrent.yaml
index 7dd3fec..1d62088 100644
--- a/deploy/charts/openconceptlab/templates/celery/ocl_celery_concurrent.yaml
+++ b/deploy/charts/openconceptlab/templates/celery/ocl_celery_concurrent.yaml
@@ -51,4 +51,43 @@ spec:
               value: {{ .Values.app.container.env.redisPort | quote }}
 
             - name: DEBUG
-              value: {{ .Values.app.container.env.debug | quote }}
\ No newline at end of file
+              value: {{ .Values.app.container.env.debug | quote }}
+
+            - name: DB_HOST
+              value: {{ .Values.app.container.env.dbHost | quote }}
+
+            - name: DB_PORT
+              value: {{ .Values.app.container.env.dbPort | quote }}
+
+            - name: DB
+              value: {{ .Values.app.container.env.db | quote }}
+            
+            - name: DB_PASSWORD
+              value: {{ .Values.app.container.env.dbPassword | quote }}
+
+            - name: API_HOST
+              value: {{ .Values.app.container.env.redisHost | quote }}
+
+            - name: API_PORT
+              value: {{ .Values.app.container.env.redisPort | quote }}
+
+        - name: cloudsql-proxy
+          image: gcr.io/cloudsql-docker/gce-proxy:1.33.2
+          command: [
+            "/cloud_sql_proxy",
+            "-instances={{ .Values.app.container.env.databaseInstanceConnectionName }}=tcp:5432",
+            "-credential_file={{ .Values.app.container.env.googleApplicationCredentialsSecret.filePath }}"]
+
+          securityContext:
+            runAsNonRoot: false
+            allowPrivilegeEscalation: false
+
+          volumeMounts:
+          - name: {{ .Values.app.container.env.googleApplicationCredentialsSecret.name }}
+            mountPath: {{ .Values.app.container.env.googleApplicationCredentialsSecret.mountPath }}
+            readOnly: true
+    
+      volumes:
+        - name: {{ .Values.app.container.env.googleApplicationCredentialsSecret.name }}
+          secret:
+            secretName: {{ .Values.app.container.env.googleApplicationCredentialsSecret.name }}
\ No newline at end of file
diff --git a/deploy/charts/openconceptlab/templates/celery/ocl_celery_worker.yaml b/deploy/charts/openconceptlab/templates/celery/ocl_celery_worker.yaml
index 320cc08..07d6eca 100644
--- a/deploy/charts/openconceptlab/templates/celery/ocl_celery_worker.yaml
+++ b/deploy/charts/openconceptlab/templates/celery/ocl_celery_worker.yaml
@@ -51,4 +51,43 @@ spec:
               value: {{ .Values.app.container.env.redisPort | quote }}
 
             - name: DEBUG
-              value: {{ .Values.app.container.env.debug | quote }}
\ No newline at end of file
+              value: {{ .Values.app.container.env.debug | quote }}
+
+            - name: DB_HOST
+              value: {{ .Values.app.container.env.dbHost | quote }}
+
+            - name: DB_PORT
+              value: {{ .Values.app.container.env.dbPort | quote }}
+
+            - name: DB
+              value: {{ .Values.app.container.env.db | quote }}
+            
+            - name: DB_PASSWORD
+              value: {{ .Values.app.container.env.dbPassword | quote }}
+
+            - name: API_HOST
+              value: {{ .Values.app.container.env.redisHost | quote }}
+
+            - name: API_PORT
+              value: {{ .Values.app.container.env.redisPort | quote }}
+
+        - name: cloudsql-proxy
+          image: gcr.io/cloudsql-docker/gce-proxy:1.33.2
+          command: [
+            "/cloud_sql_proxy",
+            "-instances={{ .Values.app.container.env.databaseInstanceConnectionName }}=tcp:5432",
+            "-credential_file={{ .Values.app.container.env.googleApplicationCredentialsSecret.filePath }}"]
+
+          securityContext:
+            runAsNonRoot: false
+            allowPrivilegeEscalation: false
+
+          volumeMounts:
+          - name: {{ .Values.app.container.env.googleApplicationCredentialsSecret.name }}
+            mountPath: {{ .Values.app.container.env.googleApplicationCredentialsSecret.mountPath }}
+            readOnly: true
+    
+      volumes:
+        - name: {{ .Values.app.container.env.googleApplicationCredentialsSecret.name }}
+          secret:
+            secretName: {{ .Values.app.container.env.googleApplicationCredentialsSecret.name }}
\ No newline at end of file
diff --git a/deploy/charts/openconceptlab/templates/celery/ocl_celery_worker_indexing.yaml b/deploy/charts/openconceptlab/templates/celery/ocl_celery_worker_indexing.yaml
index f210a48..886263e 100644
--- a/deploy/charts/openconceptlab/templates/celery/ocl_celery_worker_indexing.yaml
+++ b/deploy/charts/openconceptlab/templates/celery/ocl_celery_worker_indexing.yaml
@@ -51,4 +51,43 @@ spec:
               value: {{ .Values.app.container.env.redisPort | quote }}
 
             - name: DEBUG
-              value: {{ .Values.app.container.env.debug | quote }}
\ No newline at end of file
+              value: {{ .Values.app.container.env.debug | quote }}
+
+            - name: DB_HOST
+              value: {{ .Values.app.container.env.dbHost | quote }}
+
+            - name: DB_PORT
+              value: {{ .Values.app.container.env.dbPort | quote }}
+
+            - name: DB
+              value: {{ .Values.app.container.env.db | quote }}
+            
+            - name: DB_PASSWORD
+              value: {{ .Values.app.container.env.dbPassword | quote }}
+
+            - name: API_HOST
+              value: {{ .Values.app.container.env.redisHost | quote }}
+
+            - name: API_PORT
+              value: {{ .Values.app.container.env.redisPort | quote }}
+
+        - name: cloudsql-proxy
+          image: gcr.io/cloudsql-docker/gce-proxy:1.33.2
+          command: [
+            "/cloud_sql_proxy",
+            "-instances={{ .Values.app.container.env.databaseInstanceConnectionName }}=tcp:5432",
+            "-credential_file={{ .Values.app.container.env.googleApplicationCredentialsSecret.filePath }}"]
+
+          securityContext:
+            runAsNonRoot: false
+            allowPrivilegeEscalation: false
+
+          volumeMounts:
+          - name: {{ .Values.app.container.env.googleApplicationCredentialsSecret.name }}
+            mountPath: {{ .Values.app.container.env.googleApplicationCredentialsSecret.mountPath }}
+            readOnly: true
+    
+      volumes:
+        - name: {{ .Values.app.container.env.googleApplicationCredentialsSecret.name }}
+          secret:
+            secretName: {{ .Values.app.container.env.googleApplicationCredentialsSecret.name }}
\ No newline at end of file
diff --git a/deploy/charts/openconceptlab/templates/oclapi/api_deployment.yaml b/deploy/charts/openconceptlab/templates/oclapi/api_deployment.yaml
index 907a640..ee4b719 100644
--- a/deploy/charts/openconceptlab/templates/oclapi/api_deployment.yaml
+++ b/deploy/charts/openconceptlab/templates/oclapi/api_deployment.yaml
@@ -63,11 +63,14 @@ spec:
             - name: DB
               value: {{ .Values.app.container.env.db | quote }}
 
-            - name: ES_HOST
-              value: {{ .Values.app.container.env.elasticSearchHost | quote }}
+            - name: ES_HOSTS
+              value: "fcf2cd805eea4d25b3b0d0f084a7782a.eu-west-1.aws.found.io:443"
 
-            - name: ES_PORT
-              value: {{ .Values.app.container.env.elasticSearchPort | quote }}
+            - name: ES_USER
+              value: "elastic"
+
+            - name: ES_PASSWORD
+              value: "XXNHEPFJ7KBzmf3MeeW4h8wF"
             
             - name: ES_SCHEME
               value: "https"
diff --git a/deploy/charts/openconceptlab/values.yaml b/deploy/charts/openconceptlab/values.yaml
index 894cc95..1fd51a7 100644
--- a/deploy/charts/openconceptlab/values.yaml
+++ b/deploy/charts/openconceptlab/values.yaml
@@ -19,7 +19,7 @@ image:
   repository: openconceptlab/oclapi2
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "production"
+  tag: "2.3.69-0de65637"
 
 oclweb:
   port: 4000
@@ -28,7 +28,7 @@ oclweb:
     repository: openconceptlab/oclweb2
     pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "production"
+    tag: "2.1.107-3d701072"
 
 service:
   type: NodePort