diff --git a/.env b/.env
index 0c374cc..9798b59 100644
--- a/.env
+++ b/.env
@@ -45,6 +45,7 @@ GRAFANA_CONTAINER_PORT=3000
 GRAFANA_HOST_PORT=grafana:${GRAFANA_CONTAINER_PORT}
 GRAFANA_PROXIES_PATH=localhost/grafana
 GRAFANA_DB_NAME=grafana_internal_db
+GRAFANA_PASS=grafana
 
 REDIS_PORT=6379
 JS_AMP_PORT=3001
@@ -69,4 +70,3 @@ CTR_SOCKDIR=/var/tmp/nm
 
 ADM_PATH=deps/dtnma-adms
 
-GRAFANA_PASS=grafana
\ No newline at end of file
diff --git a/puppet/modules/anms/manifests/init.pp b/puppet/modules/anms/manifests/init.pp
index 5acb468..704e67e 100644
--- a/puppet/modules/anms/manifests/init.pp
+++ b/puppet/modules/anms/manifests/init.pp
@@ -5,6 +5,10 @@
   String $ctr_image_tag,
   String $version = '',
   String $gw_fqdn = $facts['networking']['fqdn'],
+  String $amp_db_user = 'root',
+  String $amp_db_password = 'root'
+  String $opensearch_admin_password = 'admin',
+  String $grafana_db_password = 'grafana',
   Optional[String] $ctr_registry_user = undef,
   Optional[String] $ctr_registry_pass = undef,
   String $cam_server_url = '',
diff --git a/puppet/modules/anms/templates/env.epp b/puppet/modules/anms/templates/env.epp
index 6de40aa..6e71e78 100644
--- a/puppet/modules/anms/templates/env.epp
+++ b/puppet/modules/anms/templates/env.epp
@@ -25,15 +25,20 @@ CAM_AGENT_NAME=<%= $anms::cam_agent_name %>
 CAM_AGENT_PASSWORD=<%= $anms::cam_agent_password %>
 
 DB_PORT=5432
-DB_USER=root
-DB_PASSWORD=root
+DB_USER=<%= $anms::amp_db_user %>
+DB_PASSWORD=<%= $anms::amp_db_password %>
 DB_NAME=amp_core
 DB_HEALTHCHECK_USER=healthcheck
 DB_HEALTHCHECK_PASSWORD=healthcheck
 
+OPENSEARCH_INITIAL_ADMIN_PASSWORD=<%= $anms::opensearch_admin_password %>
+
 GRAFANA_CONTAINER_PORT=3000
 GRAFANA_HOST_PORT=grafana:${GRAFANA_CONTAINER_PORT}
 GRAFANA_PROXIES_PATH=localhost/grafana
+GRAFANA_DB_NAME=grafana_internal_db
+GRAFANA_PASS=<%= $anms::grafana_db_password %>
+
 REDIS_PORT=6379
 JS_AMP_PORT=3001
 ANMS_UI_HTTP_PORT=9030
@@ -56,3 +61,4 @@ HOST_SOCKDIR=/run/anms
 CTR_SOCKDIR=/var/tmp/nm
 
 ADM_PATH=deps/dtnma-adms
+