diff --git a/extra/mattermost.yml b/extra/mattermost.yml
index 3b5a205..c9fe3b6 100644
--- a/extra/mattermost.yml
+++ b/extra/mattermost.yml
@@ -11,11 +11,6 @@ services:
     volumes:
       - ../../mistborn_volumes/extra/mattermost/db/var/lib/postgresql/data:/var/lib/postgresql/data
       - /etc/localtime:/etc/localtime:ro
-    env_file:
-      - ../.envs/.production/.mattermost
-    networks:
-      mattermost_net:
-        ipv4_address: 10.2.5.4
     #environment:
     #  - POSTGRES_USER=mmuser
     #  - POSTGRES_PASSWORD=mmuser_password
@@ -46,12 +41,7 @@ services:
       # When you want to use SSO with GitLab, you have to add the cert pki chain of GitLab inside Alpine
       # to avoid Token request failed: certificate signed by unknown authority (link: https://github.com/mattermost/mattermost-server/issues/13059)
       # - <path_to_your_gitlab_pki>/pki_chain.pem:/etc/ssl/certs/pki_chain.pem:ro
-    env_file:
-      - ../.envs/.production/.mattermost
-    networks:
-      mattermost_net:
-        ipv4_address: 10.2.5.3
-    #environment:
+    environment:
     #  # set same as db credentials and dbname
     #  #- MM_USERNAME=mmuser
     #  #- MM_PASSWORD=mmuser_password
@@ -60,7 +50,7 @@ services:
     #  # use the credentials you've set above, in the format:
     #  # MM_SQLSETTINGS_DATASOURCE=postgres://${MM_USERNAME}:${MM_PASSWORD}@db:5432/${MM_DBNAME}?sslmode=disable&connect_timeout=10
     #  #- MM_SQLSETTINGS_DATASOURCE=postgres://mmuser:mmuser_password@db:5432/mattermost?sslmode=disable&connect_timeout=10
-    #  - MM_SQLSETTINGS_DATASOURCE=postgres://${MM_USERNAME}:${MM_PASSWORD}@db:5432/${MM_DBNAME}?sslmode=disable&connect_timeout=10
+      - MM_SQLSETTINGS_DATASOURCE=postgres://${MM_USERNAME}:${MM_PASSWORD}@db:5432/${MM_DBNAME}?sslmode=disable&connect_timeout=10
 
     #  # in case your config is not in default location
     #  #- MM_CONFIG=/mattermost/config/config.json
@@ -88,18 +78,9 @@ services:
       # This directory must have cert files if you want to enable SSL
       #- ./volumes/web/cert:/cert:ro
       - /etc/localtime:/etc/localtime:ro
-    networks:
-      default:
-      mattermost_net:
-        ipv4_address: 10.2.5.2
 
 networks:
   default:
     external:
       name: mistborn_default
   
-  mattermost_net:
-    driver: bridge
-    ipam:
-      config:
-        - subnet: 10.2.5.0/29
diff --git a/scripts/services/Mistborn-mattermost.service b/scripts/services/Mistborn-mattermost.service
index f27606f..771bff1 100644
--- a/scripts/services/Mistborn-mattermost.service
+++ b/scripts/services/Mistborn-mattermost.service
@@ -12,7 +12,7 @@ PermissionsStartOnly=true
 ExecStartPre=/usr/local/bin/docker-compose -f /opt/mistborn/extra/mattermost.yml down
 
 # Start container when unit is started
-ExecStart=/usr/local/bin/docker-compose -f /opt/mistborn/extra/mattermost.yml up --build
+ExecStart=/usr/local/bin/docker-compose --env-file /opt/mistborn/.envs/.production/.mattermost -f /opt/mistborn/extra/mattermost.yml up --build
 # Stop container when unit is stopped
 ExecStop=/usr/local/bin/docker-compose -f /opt/mistborn/extra/mattermost.yml down
 # Post stop
diff --git a/scripts/subinstallers/gen_prod_env.sh b/scripts/subinstallers/gen_prod_env.sh
index 3dcdee4..69a4eba 100755
--- a/scripts/subinstallers/gen_prod_env.sh
+++ b/scripts/subinstallers/gen_prod_env.sh
@@ -84,6 +84,5 @@ MATTERMOST_PROD_FILE="./.envs/.production/.mattermost"
 echo "MM_USERNAME=mmuser" > $MATTERMOST_PROD_FILE
 echo "MM_PASSWORD=$1" >> $MATTERMOST_PROD_FILE
 echo "MM_DBNAME=mattermost" >> $MATTERMOST_PROD_FILE
-echo "MM_SQLSETTINGS_DATASOURCE=postgres://${MM_USERNAME}:${MM_PASSWORD}@db:5432/${MM_DBNAME}?sslmode=disable&connect_timeout=10" >> $MATTERMOST_PROD_FILE
 POSTGRES_PASSWORD=$(python3 -c "import secrets; import string; print(f''.join([secrets.choice(string.ascii_letters+string.digits) for x in range(32)]))")
 echo "POSTGRES_PASSWORD=$POSTGRES_PASSWORD" >> $MATTERMOST_PROD_FILE