diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3412b06..0de289f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,10 +27,6 @@ jobs:
   build-Docker:
 
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        dotnet-version: [ '6.0.x' ]
 
     steps:
       - uses: actions/checkout@v2
diff --git a/Dockerfile.CLI b/Dockerfile.CLI
index 089cf79..c84e036 100644
--- a/Dockerfile.CLI
+++ b/Dockerfile.CLI
@@ -18,7 +18,7 @@ RUN dotnet test --no-restore --verbosity normal
 FROM base as publish
 RUN dotnet publish Selector.CLI/Selector.CLI.csproj -c Release -o /app --no-restore
 
-FROM mcr.microsoft.com/dotnet/runtime:6.0
+FROM mcr.microsoft.com/dotnet/aspnet:6.0
 WORKDIR /app
 COPY --from=publish /app ./
 ENV DOTNET_EnableDiagnostics=0
diff --git a/docker-compose.build.yml b/docker-compose.build.yml
index 4c1e802..d877b96 100644
--- a/docker-compose.build.yml
+++ b/docker-compose.build.yml
@@ -34,3 +34,4 @@ services:
     image: postgres
     ports:
       - "5432:5432"
+    env_file: .env # set POSTGRES_PASSWORD
diff --git a/docker-compose.yml b/docker-compose.yml
index bfcdb86..ed504a5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,3 +30,4 @@ services:
     image: postgres
     ports:
       - "5432:5432"
+    env_file: .env # set POSTGRES_PASSWORD