diff --git a/dev_env/api/Dockerfile b/dev_env/api/Dockerfile
index 57100ba5a..05599a00e 100644
--- a/dev_env/api/Dockerfile
+++ b/dev_env/api/Dockerfile
@@ -1,8 +1,5 @@
-FROM quay.io/deis/go-dev:v0.22.0
+FROM quay.io/deis/go-dev:v1.5.0
 
-MAINTAINER Miguel Martinez <miguel@bitnami.com>
-
-RUN curl https://glide.sh/get | sh
 RUN go get github.com/codegangsta/gin
 
 COPY rootfs/ /
diff --git a/dev_env/api/rootfs/app-entrypoint.sh b/dev_env/api/rootfs/app-entrypoint.sh
index 81a8ef7f8..08a74ea00 100755
--- a/dev_env/api/rootfs/app-entrypoint.sh
+++ b/dev_env/api/rootfs/app-entrypoint.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 INIT_SEM=/tmp/initialized.sem
-PACKAGE_FILE=glide.lock
+PACKAGE_FILE=Gopkg.lock
 
 log () {
   echo -e "\033[0;33m$(date "+%H:%M:%S")\033[0;37m ==> $1."
@@ -16,7 +16,7 @@ dependencies_up_to_date() {
 if [ "$1" == "gin" -a "$3" == "run" ]; then
 	if ! dependencies_up_to_date; then
 		log "Packages updating..."
-		glide install
+		dep ensure
 		log "Packages updated"
 	fi
   touch $INIT_SEM
diff --git a/dev_env/ui/Dockerfile b/dev_env/ui/Dockerfile
index 3c3a1bdcb..b15831961 100644
--- a/dev_env/ui/Dockerfile
+++ b/dev_env/ui/Dockerfile
@@ -2,8 +2,8 @@ FROM bitnami/node:8
 
 # Install yarn
 RUN install_packages apt-transport-https && \
-  curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - && \
-  echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list && \
+  curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
+  echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
   install_packages yarn
 
 RUN yarn global add @angular/cli@1.4.3 && ng set --global packageManager=yarn
@@ -12,4 +12,6 @@ COPY rootfs /
 
 EXPOSE 4200 49152
 
+ENTRYPOINT ["/app-entrypoint.sh"]
+
 CMD ["ng", "serve", "--host", "0.0.0.0"]
diff --git a/dev_env/ui/rootfs/app-entrypoint.sh b/dev_env/ui/rootfs/app-entrypoint.sh
index 8febf6b2b..9f6875946 100755
--- a/dev_env/ui/rootfs/app-entrypoint.sh
+++ b/dev_env/ui/rootfs/app-entrypoint.sh
@@ -1,5 +1,12 @@
 #!/bin/bash -e
-. /opt/bitnami/base/functions
+
+# Color Palette
+RESET='\033[0m'
+MAGENTA='\033[38;5;5m'
+
+log() {
+  echo -e "${MAGENTA}$(date "+%T.%2N ")${RESET}${@}" >&2
+}
 
 INIT_SEM=/tmp/initialized.sem
 PACKAGE_FILE=/app/package.json
@@ -16,7 +23,7 @@ dependencies_up_to_date() {
 
 if [ "$1" == ng -a "$2" == "serve" ]; then
   if ! dependencies_up_to_date; then
-    log "Installing/Updating Angular dependencies (npm)"
+    log "Installing/Updating Angular dependencies (yarn)"
     yarn
     log "Dependencies updated"
   fi
@@ -37,4 +44,4 @@ if [ "$1" == ng -a "$2" == "serve" ]; then
   touch $INIT_SEM
 fi
 
-exec tini -- "$@"
+exec "$@"