diff --git a/pkg/Dockerfile b/pkg/Dockerfile
index 766ceec00..068938a57 100644
--- a/pkg/Dockerfile
+++ b/pkg/Dockerfile
@@ -54,9 +54,4 @@ RUN mix release fireguard
 RUN mkdir -p pkg/debian/opt
 RUN mv _build/prod/rel/fireguard pkg/debian/opt/fireguard
 
-# Smoke test built binary
-ENV DATABASE_URL ecto://dummy@localhost/dummy
-ENV SECRET_KEY_BASE dummy
-RUN ./pkg/debian/opt/fireguard/bin/fireguard eval 'IO.puts "Hello World!"'
-
 RUN cd pkg && dpkg-deb --build debian
diff --git a/pkg/debian/DEBIAN/lib/systemd/system/fireguard.service b/pkg/debian/DEBIAN/lib/systemd/system/fireguard.service
index 6c7ce29c6..317431e9c 100644
--- a/pkg/debian/DEBIAN/lib/systemd/system/fireguard.service
+++ b/pkg/debian/DEBIAN/lib/systemd/system/fireguard.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=FireGuard
-After=network.target
+After=postgresql.service
 
 [Service]
 Restart=on-failure