diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 9435fde..8eafc06 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -40,20 +40,29 @@ else
 fi
 
 # Defining environment variables
-sed -i "s;<research_apiurl>;$RESEARCH_APIURL;g" ${list}
-sed -i "s;<hr_apiurl>;$HR_APIURL;g" ${list}
-sed -i "s;\"<keycloak_public_json>\";'$KEYCLOAK_PUBLIC_JSON';g" ${list}
+if grep -E "<research_apiurl>|<hr_apiurl>|<keycloak_public_json>" ${list} -q;
+then
+  echo "Replacing environment variables in ${list}"
 
-if grep "try_files" ./etc/nginx/conf.d/default.conf;
+  sed -i "s;<research_apiurl>;$RESEARCH_APIURL;g" ${list}
+  sed -i "s;<hr_apiurl>;$HR_APIURL;g" ${list}
+  sed -i "s;\"<keycloak_public_json>\";'$KEYCLOAK_PUBLIC_JSON';g" ${list}
+else
+  echo "No environment placeholders found to replace in ${list}"
+fi
+
+if grep "try_files" /etc/nginx/conf.d/default.conf -q;
 then
   echo "Try file already configured"
 else
-  sed -i "/index  index.html index.htm;/a \        try_files \$uri \$uri/ \/$BASEURL\/index.html;" ./etc/nginx/conf.d/default.conf
-  sed -i "s/location \/ {/location \/$BASEURL {/g" ./etc/nginx/conf.d/default.conf
-
-  mv /usr/share/nginx/html/ /usr/share/nginx/html$BASEURL
-  mkdir /usr/share/nginx/html
-  mv /usr/share/nginx/html$BASEURL/ /usr/share/nginx/html/$BASEURL
+  if [ -z "$BASEURL" ]
+  then
+      sed -i '/index  index.html index.htm;/a \        try_files $uri $uri/ /index.html;' /etc/nginx/conf.d/default.conf
+  else
+      sed -i "\|index  index.html index.htm;|a \        try_files \$uri \$uri/ /$BASEURL/index.html;" /etc/nginx/conf.d/default.conf
+      sed -i "s|location / {|location /$BASEURL {|g" /etc/nginx/conf.d/default.conf
+      sed -i "\|location /$BASEURL|,/}/s|root |alias|" /etc/nginx/conf.d/default.conf
+  fi
 fi
 
 echo `date +%FT%T%Z` "- docker-entrypoint.sh finished..."
diff --git a/package.json b/package.json
index abe5414..b94210c 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,8 @@
   "scripts": {
     "start": "REACT_APP_VERSION=$npm_package_version react-scripts start",
     "build": "GENERATE_SOURCEMAP=false REACT_APP_VERSION=$npm_package_version react-scripts build",
+    "build:dev": "REACT_APP_VERSION=$npm_package_version react-scripts build && npm run k8s",
+    "k8s": "kubectl exec deployments/$(npm pkg get name | tr -d '\"') -- docker-entrypoint.sh || echo 'K8s deployment not found/unavailable'",
     "lint": "eslint \"{src,apps,libs,test}/*/.ts\" --fix",
     "test": "react-scripts test",
     "eject": "react-scripts eject"