diff --git a/Makefile b/Makefile
index 691ba6fc..036a1ccd 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,7 @@ envfile_testing:
 	@if test -f ${ENV_FILE}; then echo ".env file exists already"; exit 1; fi
 	@mkdir -p $(shell dirname ${ENV_FILE}) && touch ${ENV_FILE}
 	@echo SECRET_KEY=\"${GET_SECRET_KEY}\" >> ${ENV_FILE}
-	@echo SCANCODEIO_DB_PORT=\"5433\" >> ${ENV_FILE}
+	@echo PACKAGEDB_DB_HOST=\"postgres\" >> ${ENV_FILE}
 
 isort:
 	@echo "-> Apply isort changes to ensure proper imports ordering"
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 55430a9c..08c8be30 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -8,12 +8,10 @@
 resources:
   containers:
   - container: postgres
-    image: postgres
+    image: postgres:13
     env:
-      POSTGRES_DB: packagedb
-      POSTGRES_USER: packagedb
-      POSTGRES_PASSWORD: packagedb
-      POSTGRES_INITDB_ARGS: "--encoding=UTF-8 --lc-collate=en_US.UTF-8 --lc-ctype=en_US.UTF-8"
+      POSTGRES_USER: 'packagedb'
+      POSTGRES_PASSWORD: 'packagedb'
     ports:
       - 5432:5432