diff --git a/cmd/olympus/.env b/cmd/olympus/.env
index 8e7b14f7..61c4a655 100644
--- a/cmd/olympus/.env
+++ b/cmd/olympus/.env
@@ -1 +1,2 @@
 ATHENS_MONGO_STORAGE_URL=mongodb://127.0.0.1:27017
+PORT=3001
diff --git a/cmd/olympus/actions/app.go b/cmd/olympus/actions/app.go
index a7f48735..f463d3e0 100644
--- a/cmd/olympus/actions/app.go
+++ b/cmd/olympus/actions/app.go
@@ -46,7 +46,7 @@ var (
 func App() *buffalo.App {
 	if app == nil {
 		redisPort := env.OlympusRedisQueuePortWithDefault(":6379")
-		port := env.OlympusHTTPPort(":3001")
+		port := env.Port(":3001")
 
 		app = buffalo.New(buffalo.Options{
 			Addr: port,
diff --git a/pkg/config/env/olympus.go b/pkg/config/env/olympus.go
index 2309e3fb..6447d7ca 100644
--- a/pkg/config/env/olympus.go
+++ b/pkg/config/env/olympus.go
@@ -6,9 +6,3 @@ import "github.com/gobuffalo/envy"
 func OlympusGlobalEndpointWithDefault(value string) string {
 	return envy.Get("OLYMPUS_GLOBAL_ENDPOINT", value)
 }
-
-// OlympusHTTPPort returns the port that the olympus server is running on;
-// should default to 3001.
-func OlympusHTTPPort(value string) string {
-	return envy.Get("OLYMPUS_HTTP_PORT", value)
-}
diff --git a/pkg/config/env/port.go b/pkg/config/env/port.go
new file mode 100644
index 00000000..0719a6de
--- /dev/null
+++ b/pkg/config/env/port.go
@@ -0,0 +1,10 @@
+package env
+
+import "github.com/gobuffalo/envy"
+
+// Port returns the PORT env var that a server (Olympus/Zeus) should
+// run on. Buffalo uses the PORT environment so this keeps it consistent
+// but can also be used directly as a Buffalo service option
+func Port(value string) string {
+	return envy.Get("PORT", value)
+}