diff --git a/core/entrypoint.sh b/core/entrypoint.sh
index 53db3a0be062bf8cea9d6808e9aead3021498ce0..6aa71eea5b865cac9904171a840c1018c9ffd97c 100644
--- a/core/entrypoint.sh
+++ b/core/entrypoint.sh
@@ -28,7 +28,7 @@ file_env() {
 	elif [ "${!fileVar:-}" ]; then
 		val="$(< "${!fileVar}")"
 	fi
-	cat >> /etc/bash.bashrc <<EOF
+	cat >> ~/.profile <<EOF
 EOF
 	echo "the value of variable ${var} is set" >&2
   # make them also available in preparatory steps until container starts
diff --git a/testing/registrar_test.sh b/testing/registrar_test.sh
index 0aec801af66598a1c59309601494c80b7569eccc..be5b8de2acd9ffcf2c5e40a8c4dc889832aa9244 100755
--- a/testing/registrar_test.sh
+++ b/testing/registrar_test.sh
@@ -5,7 +5,7 @@ echo "inside registrar_test"
 IFS=","
 
 while read product; do
-    docker exec -e OS_PASSWORD=$OS_PASSWORD -i $(docker ps -qf "name=emg-pvs_registrar") \
+    docker exec -i $(docker ps -qf "name=emg-pvs_registrar") \
         python3 /registrar.py \
             --objects-prefix $product \
             --service-url $SERVICE_URL \