diff --git a/odoo-configmap.yaml b/odoo-configmap.yaml
new file mode 100644
index 0000000..0894403
--- /dev/null
+++ b/odoo-configmap.yaml
@@ -0,0 +1,7 @@
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: odoo-configmap
+  namespace: odoo
+data:
+  DB_USER: odoo
\ No newline at end of file
diff --git a/odoo-deploy.yaml b/odoo-deploy.yaml
index df6c879..73f2e1f 100644
--- a/odoo-deploy.yaml
+++ b/odoo-deploy.yaml
@@ -15,16 +15,22 @@ spec:
     spec:
       containers:
         - name: odoo
-          image: docker.io/bitnami/odoo:16
+          image: bitnamilegacy/odoo:16
           ports:
             - containerPort: 8069
           env:
             - name: ALLOW_EMPTY_PASSWORD
               value: "yes"
             - name: ODOO_DATABASE_USER
-              value: odoo
+              valueFrom:
+                configMapKeyRef:
+                  name: odoo-configmap
+                  key: DB_USER
             - name: ODOO_DATABASE_PASSWORD
-              value: k8smaestro
+              valueFrom:
+                secretKeyRef:
+                  name: odoo-secret
+                  key: DB_PASSWORD
             - name: ODOO_DATABASE_NAME
               value: k8smaestro
           volumeMounts:
diff --git a/odoo-secret.yaml b/odoo-secret.yaml
new file mode 100644
index 0000000..1e173f9
--- /dev/null
+++ b/odoo-secret.yaml
@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: odoo-secret
+  namespace: odoo
+type: Opaque
+data:
+  DB_PASSWORD: azhzbWFlc3Rybw==
\ No newline at end of file
diff --git a/postgres-deploy.yaml b/postgres-deploy.yaml
index 3ba12c5..bf31f60 100644
--- a/postgres-deploy.yaml
+++ b/postgres-deploy.yaml
@@ -15,16 +15,22 @@ spec:
     spec:
       containers:
         - name: postgres
-          image: docker.io/bitnami/postgresql:15
+          image: bitnamilegacy/postgresql:15
           ports:
             - containerPort: 5432
           env:
             - name: POSTGRESQL_DATABASE
               value: k8smaestro
             - name: POSTGRESQL_PASSWORD
-              value: k8smaestro
-            - name: POSTGRESQL_USERNAME
-              value: odoo
+              valueFrom:
+                secretKeyRef:
+                  name: odoo-secret
+                  key: DB_PASSWORD
+            - name: POSTGRES_USERNAME
+              valueFrom:
+                configMapKeyRef:
+                  name: odoo-configmap
+                  key: DB_USER
           volumeMounts:
             - name: postgres-storage
               mountPath: /bitnami/postgresql