diff --git a/server/Makefile b/server/Makefile
index 7268c4bc44..4a137978f5 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -8,15 +8,6 @@ else
 	PLATFORM := $(shell uname)
 endif
 
-# Set an environment variable on Linux used to resolve `docker.host.internal` inconsistencies with
-# docker. This can be reworked once https://github.com/docker/for-linux/issues/264 is resolved
-# satisfactorily.
-ifeq ($(PLATFORM),Linux)
-	export IS_LINUX = -linux
-else
-	export IS_LINUX =
-endif
-
 # Detect Apple Silicon and set a flag.
 ifeq ($(shell uname)/$(shell uname -m),Darwin/arm64)
   ARM_BASED_MAC = true
diff --git a/server/build/docker-compose.common.yml b/server/build/docker-compose.common.yml
index 324594972e..b6a05a03a2 100644
--- a/server/build/docker-compose.common.yml
+++ b/server/build/docker-compose.common.yml
@@ -144,10 +144,12 @@ services:
     image: "prom/prometheus:v2.46.0"
     user: root
     volumes:
-      - "./docker/prometheus${IS_LINUX}.yml:/etc/prometheus/prometheus.yml"
+      - "./docker/prometheus.yml:/etc/prometheus/prometheus.yml"
       - "/var/run/docker.sock:/var/run/docker.sock"
     networks:
       - mm-test
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
   grafana:
     image: "grafana/grafana:10.4.2"
     volumes:
diff --git a/server/build/docker/prometheus-linux.yml b/server/build/docker/prometheus-linux.yml
deleted file mode 100644
index 7a575ca959..0000000000
--- a/server/build/docker/prometheus-linux.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-global:
-  scrape_interval: 5s
-  evaluation_interval: 60s
-
-scrape_configs:
-  - job_name: 'mattermost'
-    static_configs:
-      - targets: ['172.17.0.1:8067']