diff --git a/docs/docker-swarm/swarm.md b/docs/docker-swarm/swarm.md
index e65b22dd1..1823e0ec7 100644
--- a/docs/docker-swarm/swarm.md
+++ b/docs/docker-swarm/swarm.md
@@ -108,8 +108,8 @@ $ docker run -d --name functions-00 \
         --network=functions-network \
         -p 8080:8080 \
         -v /var/run/docker.sock:/var/run/docker.sock \
-        -e 'MQ=redis://functions-redis' \
-        -e 'DB=postgres://postgres:mysecretpassword@functions-postgres/?sslmode=disable' \
+        -e 'MQ_URL=redis://functions-redis' \
+        -e 'DB_URL=postgres://postgres:mysecretpassword@functions-postgres/?sslmode=disable' \
         iron/functions
 ```
 
diff --git a/docs/kubernetes/kubernetes-production/functions-config.yaml b/docs/kubernetes/kubernetes-production/functions-config.yaml
index 030185f99..6caa0edf5 100644
--- a/docs/kubernetes/kubernetes-production/functions-config.yaml
+++ b/docs/kubernetes/kubernetes-production/functions-config.yaml
@@ -3,5 +3,5 @@ apiVersion: v1
 metadata:
   name: functions-config
 data:
-  MQ: redis://redis-master.default
-  DB: postgres://postgres:mysecretpassword@postgresql-master.default/?sslmode=disable
\ No newline at end of file
+  MQ_URL: redis://redis-master.default
+  DB_URL: postgres://postgres:mysecretpassword@postgresql-master.default/?sslmode=disable
\ No newline at end of file
diff --git a/docs/kubernetes/kubernetes-production/functions-deployment.yaml b/docs/kubernetes/kubernetes-production/functions-deployment.yaml
index c6d9c79fa..26a5eed1e 100644
--- a/docs/kubernetes/kubernetes-production/functions-deployment.yaml
+++ b/docs/kubernetes/kubernetes-production/functions-deployment.yaml
@@ -20,16 +20,16 @@ spec:
         env:
         - name: DOCKER_HOST
           value: unix:///var/run/docker.sock
-        - name: MQ
+        - name: MQ_URL
           valueFrom:
             configMapKeyRef:
               name: functions-config
-              key: MQ
-        - name: DB
+              key: MQ_URL
+        - name: DB_URL
           valueFrom:
             configMapKeyRef:
               name: functions-config
-              key: DB
+              key: DB_URL
         volumeMounts:
         - mountPath: "/var/run/docker.sock"
           name: docker-socket
diff --git a/docs/mqs/README.md b/docs/mqs/README.md
index 01dbd44a9..8349d8b65 100644
--- a/docs/mqs/README.md
+++ b/docs/mqs/README.md
@@ -2,10 +2,10 @@
 
 A message queue is used to coordinate asynchronous function calls that run through IronFunctions.
 
-We currently support the following message queues and they are passed in via the `MQ` environment variable. For example:
+We currently support the following message queues and they are passed in via the `MQ_URL` environment variable. For example:
 
 ```sh
-docker run -e "MQ=redis://localhost:6379/" ...
+docker run -e "MQ_URL=redis://localhost:6379/" ...
 ```
 
 ## [Bolt](https://github.com/boltdb/bolt) (default)
diff --git a/docs/options.md b/docs/options.md
index 8b5318e0e..fbedd8891 100644
--- a/docs/options.md
+++ b/docs/options.md
@@ -15,11 +15,11 @@ docker run -e VAR_NAME=VALUE ...
 <th>Description</th>
 </tr>
 <tr>
-<td>DB</td>
+<td>DB_URL</td>
 <td>The database URL to use in URL format. See [Databases](databases/README.md) for more information. Default: BoltDB in current working directory `bolt.db`.</td>
 </tr>
 <tr>
-<td>MQ</td>
+<td>MQ_URL</td>
 <td>The message queue to use in URL format. See [Message Queues](mqs/README.md) for more information. Default: BoltDB in current working directory `queue.db`.</td>
 </tr>
 <tr>
diff --git a/main.go b/main.go
index 5864072e6..9df481273 100644
--- a/main.go
+++ b/main.go
@@ -19,8 +19,8 @@ import (
 
 const (
 	envLogLevel = "log_level"
-	envMQ       = "mq"
-	envDB       = "db"
+	envMQ       = "mq_url"
+	envDB       = "db_url"
 	envPort     = "port" // be careful, Gin expects this variable to be "port"
 	envAPIURL   = "api_url"
 	envNumAsync = "num_async"