diff --git a/containers/chameleon/Dockerfile.chameleon b/containers/chameleon/Dockerfile.chameleon
index e00bc5e..f5fb70c 100644
--- a/containers/chameleon/Dockerfile.chameleon
+++ b/containers/chameleon/Dockerfile.chameleon
@@ -1,5 +1,5 @@
 # xosproject/chameleon
-FROM xosproject/xos-base
+FROM xosproject/xos-base:candidate
 
 # xos-base already has protoc and dependencies installed
 
diff --git a/containers/xos/Dockerfile.devel b/containers/xos/Dockerfile.devel
deleted file mode 100644
index 11a6815..0000000
--- a/containers/xos/Dockerfile.devel
+++ /dev/null
@@ -1,34 +0,0 @@
-# xosproject/xos (devel)
-FROM xosproject/xos-base
-
-# Install XOS
-ADD xos /opt/xos
-
-RUN chmod +x /opt/xos/tools/xos-manage \
- && mkdir -p /opt/cord_profile /opt/xos_services /opt/xos_libraries \
- && sync \
- && /opt/xos/tools/xos-manage genkeys
-
-# Set environment variables
-ENV HOME /root
-
-# Define working directory
-WORKDIR /opt/xos
-
-# Label image
-ARG org_label_schema_schema_version=1.0
-ARG org_label_schema_name=xos
-ARG org_label_schema_version=unknown
-ARG org_label_schema_vcs_url=unknown
-ARG org_label_schema_vcs_ref=unknown
-ARG org_label_schema_build_date=unknown
-ARG org_opencord_vcs_commit_date=unknown
-
-LABEL org.label-schema.schema-version=$org_label_schema_schema_version \
-      org.label-schema.name=$org_label_schema_name \
-      org.label-schema.version=$org_label_schema_version \
-      org.label-schema.vcs-url=$org_label_schema_vcs_url \
-      org.label-schema.vcs-ref=$org_label_schema_vcs_ref \
-      org.label-schema.build-date=$org_label_schema_build_date \
-      org.opencord.vcs-commit-date=$org_opencord_vcs_commit_date
-
diff --git a/containers/xos/Makefile b/containers/xos/Makefile
index f1713d7..b776456 100644
--- a/containers/xos/Makefile
+++ b/containers/xos/Makefile
@@ -37,22 +37,6 @@
 	sudo docker build --no-cache=${NO_DOCKER_CACHE} --rm \
 	-f Dockerfile.base -t xosproject/xos-base ${BUILD_ARGS} .
 
-build:
-	sudo docker build --no-cache=${NO_DOCKER_CACHE} --rm \
-	-f Dockerfile -t ${IMAGE_NAME} ${BUILD_ARGS} .
-
-custom:
-	docker build --no-cache=${NO_DOCKER_CACHE} --rm \
-	--build-arg XOS_GIT_REPO=${XOS_GIT_REPO} \
-	--build-arg XOS_GIT_BRANCH=${XOS_GIT_BRANCH} \
-	-f Dockerfile -t ${IMAGE_NAME} ${BUILD_ARGS} .
-
-devel:
-	sudo docker build --no-cache=${NO_DOCKER_CACHE} --rm \
-	--build-arg XOS_GIT_COMMIT_HASH="${XOS_GIT_COMMIT_HASH}" \
-	--build-arg XOS_GIT_COMMIT_DATE="${XOS_GIT_COMMIT_DATE}" \
-	-f Dockerfile.devel -t ${IMAGE_NAME} ${BUILD_ARGS} ../..
-
 test:
 	sudo docker build --no-cache=${NO_DOCKER_CACHE} --rm \
 	-f Dockerfile.test -t xosproject/xos-test ${BUILD_ARGS} ../..