diff --git a/Makefile b/Makefile
index f0d44c9..8829311 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ SHORT_NAME := slugrunner
 
 export GO15VENDOREXPERIMENT=1
 
-IMAGE_PREFIX ?= deis
+IMAGE_PREFIX ?= hephy
 
 include versioning.mk
 
@@ -10,7 +10,7 @@ SHELL_SCRIPTS = $(wildcard rootfs/bin/*) $(wildcard rootfs/runner/*) $(wildcard
 
 # The following variables describe the containerized development environment
 # and other build options
-DEV_ENV_IMAGE := quay.io/deis/go-dev:0.20.0
+DEV_ENV_IMAGE := hephy/go-dev:v1.28.3
 DEV_ENV_WORK_DIR := /go/src/${REPO_PATH}
 DEV_ENV_CMD := docker run --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR} ${DEV_ENV_IMAGE}
 DEV_ENV_CMD_INT := docker run -it --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR} ${DEV_ENV_IMAGE}