diff --git a/docker-compose-env-vars.yaml b/docker-compose-env-vars.yaml
new file mode 100644
index 000000000..d3d52371b
--- /dev/null
+++ b/docker-compose-env-vars.yaml
@@ -0,0 +1,115 @@
+version: '3.8'
+
+services:
+  database:
+    image: postgres:13
+    platform: linux/x86_64
+    restart: unless-stopped
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 30s
+      timeout: 60s
+      retries: 5
+      start_period: 80s
+    volumes:
+      - ./data:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_DB=heimdall-server-production
+      - POSTGRES_PASSWORD_FILE=/run/secrets/db_password
+      - PGDATA=/var/lib/postgresql/data/pgdata
+    expose:
+      - "5432"
+    secrets:
+      - db_password
+
+  certs:
+    image: registry.access.redhat.com/ubi8/ubi:latest
+    platform: linux/x86_64
+    restart: unless-stopped
+    command: sh -c "sh /etc/pki/ca-trust/source/anchors/dodcerts.sh && update-ca-trust && tail -f /dev/null"
+    volumes:
+      - type: volume
+        source: cert_bundles
+        target: /etc/pki/ca-trust/extracted/
+      - type: bind
+        source: ./certs/
+        target: /etc/pki/ca-trust/source/anchors/
+
+  server:
+    image: mitre/heimdall2:latest
+    platform: linux/x86_64
+    restart: unless-stopped
+    environment:
+      - NODE_ENV=production
+      - DATABASE_HOST=database
+      - DATABASE_PASSWORD_FILE=/run/secrets/db_password
+      - JWT_SECRET=${JWT_SECRET}
+      - API_KEY_SECRET=${API_KEY_SECRET}
+    env_file: .env
+    ports:
+      - "3000:3000"
+    volumes:
+      - type: volume
+        source: cert_bundles
+        target: /etc/pki/ca-trust/extracted/
+        read_only: true
+        volume:
+          nocopy: true
+    depends_on:
+      database:
+        condition: service_healthy
+    secrets:
+      - db_password
+
+  nginx:
+    image: nginx:alpine
+    platform: linux/x86_64
+    environment:
+      NGINX_HOST: ${NGINX_HOST}
+    volumes:
+      - ./nginx/conf/:/etc/nginx/templates/
+      - ./nginx/certs/:/etc/nginx/cert/
+    ports:
+      - "80:80"
+      - "443:443"
+    depends_on:
+      - server
+    healthcheck:
+      test: ["CMD-SHELL", "curl -f http://localhost || exit 1"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+
+volumes:
+  cert_bundles:
+
+secrets:
+  db_password:
+    file: ./secrets/db_password.txt
+
+# Instructions:
+# 1. Create a file named 'db_password.txt' in the './secrets/' directory and put the database password in it.
+#    Example content of 'db_password.txt':
+#    mysecretpassword
+#
+# 2. Ensure that the './secrets/db_password.txt' file is located in the 'secrets' directory relative to your 'docker-compose.yml' file.
+#
+# 3. Define the following environment variables in a '.env' file or export them in your shell:
+#    - JWT_SECRET: The secret key for JWT.
+#    - API_KEY_SECRET: The secret key for API keys.
+#    - NGINX_HOST: The hostname or IP address for the Nginx server.
+#
+#    Example content of '.env':
+#    JWT_SECRET=your_jwt_secret
+#    API_KEY_SECRET=your_api_key_secret
+#    NGINX_HOST=your_nginx_host
+#
+# 4. Use named volumes ('cert_bundles') for better management.
+#
+# 5. The 'certs' service updates the CA trust store with custom certificates.
+#
+# 6. The 'server' service runs the Heimdall2 application.
+#
+# 7. The 'nginx' service serves as a reverse proxy for the Heimdall2 application.
+#
+# 8. The 'healthcheck' for the 'nginx' service ensures it is running correctly.
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 2901d6d16..897d2f9c8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,9 @@
+version: '3.8'
+
 services:
   database:
     image: postgres:13
+    platform: linux/x86_64
     restart: unless-stopped
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U postgres"]
@@ -12,13 +15,16 @@ services:
       - ./data:/var/lib/postgresql/data
     environment:
       - POSTGRES_DB=heimdall-server-production
-      - POSTGRES_PASSWORD=${DATABASE_PASSWORD}
+      - POSTGRES_PASSWORD_FILE=/run/secrets/db_password
       - PGDATA=/var/lib/postgresql/data/pgdata
     expose:
       - "5432"
+    secrets:
+      - db_password
 
   certs:
     image: registry.access.redhat.com/ubi8/ubi:latest
+    platform: linux/x86_64
     restart: unless-stopped
     command: sh -c "sh /etc/pki/ca-trust/source/anchors/dodcerts.sh && update-ca-trust && tail -f /dev/null"
     volumes:
@@ -30,15 +36,16 @@ services:
         target: /etc/pki/ca-trust/source/anchors/
 
   server:
-    image: mitre/heimdall2:release-latest
+    image: mitre/heimdall2:latest
+    platform: linux/x86_64
     restart: unless-stopped
     environment:
       - NODE_ENV=production
       - DATABASE_HOST=database
-      - DATABASE_PASSWORD=${DATABASE_PASSWORD}
+      - DATABASE_PASSWORD_FILE=/run/secrets/db_password
     env_file: .env
     ports:
-      - "3000"
+      - "3000:3000"
     volumes:
       - type: volume
         source: cert_bundles
@@ -49,9 +56,12 @@ services:
     depends_on:
       database:
         condition: service_healthy
+    secrets:
+      - db_password
 
   nginx:
     image: nginx:alpine
+    platform: linux/x86_64
     environment:
       NGINX_HOST: ${NGINX_HOST}
     volumes:
@@ -61,7 +71,35 @@ services:
       - "80:80"
       - "443:443"
     depends_on:
-      - "server"
+      - server
+    healthcheck:
+      test: ["CMD-SHELL", "curl -f http://localhost || exit 1"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
 
 volumes:
   cert_bundles:
+
+secrets:
+  db_password:
+    file: ./secrets/db_password.txt
+
+# Instructions:
+# 1. Create a file named 'db_password.txt' in the './secrets/' directory and put the database password in it.
+#    Example content of 'db_password.txt':
+#    mysecretpassword
+#
+# 2. Ensure that the './secrets/db_password.txt' file is located in the 'secrets' directory relative to your 'docker-compose.yml' file.
+#
+# 3. The 'POSTGRES_PASSWORD_FILE' and 'DATABASE_PASSWORD_FILE' environment variables are used to point to the secret file within the container.
+#
+# 4. Use named volumes ('cert_bundles') for better management.
+#
+# 5. The 'certs' service updates the CA trust store with custom certificates.
+#
+# 6. The 'server' service runs the Heimdall2 application.
+#
+# 7. The 'nginx' service serves as a reverse proxy for the Heimdall2 application.
+#
+# 8. The 'healthcheck' for the 'nginx' service ensures it is running correctly.
\ No newline at end of file
diff --git a/setup-dev-env.ps1 b/setup-dev-env.ps1
new file mode 100644
index 000000000..8a2365915
--- /dev/null
+++ b/setup-dev-env.ps1
@@ -0,0 +1,159 @@
+<#
+.SYNOPSIS
+This script sets up the development environment for the Heimdall2 project by creating and populating a .env file with necessary environment variables.
+
+.DESCRIPTION
+The script performs the following tasks:
+1. Defines the path to the .env file.
+2. Provides a function to read user input with a default value.
+3. Provides a function to add key-value pairs to the .env file.
+4. Provides a function to generate a random key of a specified length.
+5. Checks if the .env file exists and creates it if it doesn't.
+6. Sets the NODE_ENV environment variable to "development".
+7. Prompts the user for PostgreSQL database username and password, and sets the corresponding environment variables.
+8. Prompts the user for the JWT expire time and sets the corresponding environment variable.
+9. Generates a JWT secret and sets the corresponding environment variable.
+10. Optionally enables API keys and sets the corresponding environment variable.
+11. Prompts the user for the FQDN/Hostname/IP Address and sets the corresponding environment variable.
+12. Checks if the SSL certificate exists and generates a new self-signed certificate if it doesn't.
+
+.PARAMETER ENV_PATH
+The path to the .env file.
+
+.PARAMETER prompt
+The prompt to display to the user.
+
+.PARAMETER default
+The default value to use if the user doesn't enter anything.
+
+.PARAMETER key
+The key to add to the .env file.
+
+.PARAMETER value
+The value to add to the .env file.
+
+.PARAMETER length
+The length of the key to generate.
+
+.EXAMPLE
+.\setup-dev-env.ps1
+This command runs the script to set up the development environment for the Heimdall2 project.
+
+.NOTES
+- Ensure that OpenSSL is installed on your system if you need to generate a self-signed SSL certificate.
+- The script generates a self-signed SSL certificate that expires in 7 days. For production environments, use a valid SSL certificate.
+
+#>
+
+# Constants
+$ENV_PATH = "apps/backend/.env"
+
+# Function to display help information
+function Show-Help {
+    Write-Host "Usage: .\setup-dev-env.ps1 [--help]"
+    Write-Host ""
+    Write-Host "This script sets up the development environment for the Heimdall2 project by creating and populating a .env file with necessary environment variables."
+    Write-Host ""
+    Write-Host "Options:"
+    Write-Host "  --help        Display this help message and exit"
+    exit 0
+}
+
+# Function to read input from the user with a default value
+function Read-Input {
+    param (
+        [string]$prompt,  # The prompt to display to the user
+        [string]$default  # The default value to use if the user doesn't enter anything
+    )
+    # Read the input from the user
+    $input = Read-Host -Prompt $prompt
+    # If the user didn't enter anything, use the default value
+    if ($input -eq "") { $input = $default }
+    # Return the input
+    return $input
+}
+
+# Function to add a key-value pair to the .env file
+function Add-To-Env {
+    param (
+        [string]$key,    # The key to add
+        [string]$value   # The value to add
+    )
+    # Add the key-value pair to the .env file
+    Add-Content -Path $ENV_PATH -Value "$key=$value"
+}
+
+# Function to generate a random key of a specified length
+function Generate-Key {
+    param (
+        [int]$length  # The length of the key to generate
+    )
+    # Generate a random string of uppercase and lowercase ASCII letters
+    return -join ((65..90) + (97..122) | Get-Random -Count $length | % {[char]$_})
+}
+
+# Check if the --help option was provided
+if ($args -contains "--help") {
+    Show-Help
+}
+
+# Check if the .env file exists, and create it if it doesn't
+if (!(Test-Path -Path $ENV_PATH)) {
+    Write-Host ".env does not exist, creating..."
+    try {
+        New-Item -Path $ENV_PATH -ItemType File | Out-Null
+    } catch {
+        Write-Host "Error: Unable to create .env file."
+        exit 1
+    }
+}
+
+# Set the NODE_ENV environment variable to development
+Add-To-Env "NODE_ENV" "development"
+
+# Prompt the user for the PostgreSQL database username and password, and set the corresponding environment variables
+$dbusername = Read-Input "Enter the username for the PostgreSQL database" "postgres"
+Add-To-Env "DATABASE_USERNAME" $dbusername
+
+$dbpassword = Read-Input "Enter the password for the PostgreSQL database" ""
+if ($dbpassword -ne "") {
+    Add-To-Env "DATABASE_PASSWORD" $dbpassword
+}
+
+# Prompt the user for the JWT expire time, and set the corresponding environment variable
+$jwtexpiretime = Read-Input "Enter the JWT expire time (e.g., 1d or 25m)" "1d"
+Add-To-Env "JWT_EXPIRE_TIME" $jwtexpiretime
+
+# Generate a JWT secret and set the corresponding environment variable
+$jwtsecret = Generate-Key -length 64
+Add-To-Env "JWT_SECRET" $jwtsecret
+
+# Prompt the user to enable API keys, and if enabled, generate an API key and set the corresponding environment variable
+$enableapikeys = Read-Input "Enable API keys (API_KEY_SECRET) [Y/n]" "n"
+if ($enableapikeys -eq "Y") {
+    $apikey = Generate-Key -length 33
+    Add-To-Env "API_KEY_SECRET" $apikey
+}
+
+# Prompt the user for the FQDN/Hostname/IP Address, and set the corresponding environment variable
+$nginxhost = Read-Input "Enter your FQDN/Hostname/IP Address" "127.0.0.1"
+Add-To-Env "NGINX_HOST" $nginxhost
+
+# Check if the SSL certificate exists, and if it doesn't, generate a new self-signed certificate
+if (!(Test-Path -Path "./nginx/certs/ssl_certificate.crt")) {
+    Write-Host "SSL Certificate does not exist, creating self-signed certificate..."
+    Write-Host "Be sure your production environment is configured to work with your self-signed certificate."
+    if (Get-Command openssl -ErrorAction SilentlyContinue) {
+        Write-Host "Generating certificate (Expires in 7 days)..."
+        try {
+            openssl req -newkey rsa:4096 -x509 -sha256 -days 7 -nodes -out nginx/certs/ssl_certificate.crt -keyout nginx/certs/ssl_certificate_key.key -subj "/C=US/ST=SelfSigned/L=SelfSigned/O=SelfSigned/OU=SelfSigned/CN=SelfSigned"
+            Write-Host "Certificates were generated"
+        } catch {
+            Write-Host "Error: Unable to generate SSL certificates."
+        }
+    } else {
+        Write-Host "OpenSSL is not installed. Please install OpenSSL and re-run this script."
+    }
+} else {
+    Write-Host "SSL Certificate already exists. If you would like to regenerate your certificates, please delete the files in ./nginx/certs/ and re-run this script."
+}
\ No newline at end of file