diff --git a/ui/.env b/ui/.env
index ba1d4108..e68a1226 100644
--- a/ui/.env
+++ b/ui/.env
@@ -1 +1 @@
-REACT_APP_GRAPHQL_URI=http://localhost:4001/graphql
\ No newline at end of file
+GRAPHQL_ENDPOINT=http://localhost:4001/graphql
\ No newline at end of file
diff --git a/ui/Dockerfile b/ui/Dockerfile
index 11b3be8d..bf6b65f8 100644
--- a/ui/Dockerfile
+++ b/ui/Dockerfile
@@ -2,7 +2,7 @@
 FROM node:10
 
 ARG GRAPHQL_ENDPOINT
-ENV REACT_APP_GRAPHQL_URI=${GRAPHQL_ENDPOINT}
+ENV GRAPHQL_ENDPOINT=${GRAPHQL_ENDPOINT}
 
 RUN mkdir -p /app
 WORKDIR /app
diff --git a/ui/apollo.config.js b/ui/apollo.config.js
index e4bf9a76..ec50edf3 100644
--- a/ui/apollo.config.js
+++ b/ui/apollo.config.js
@@ -1,9 +1,9 @@
 module.exports = {
   client: {
     service: {
-      name: 'localhost graphql',
-      url: 'http://localhost:4001/graphql',
-      skipSSLValidation: true
-    }
-  }
-}
\ No newline at end of file
+      name: 'graphql endpoint',
+      url: process.env.GRAPHQL_ENDPOINT || 'http://localhost:4001/graphql',
+      skipSSLValidation: true,
+    },
+  },
+}