diff --git a/xos/configurations/devel/Makefile b/xos/configurations/devel/Makefile
index 9af50af..e7bf0f4 100644
--- a/xos/configurations/devel/Makefile
+++ b/xos/configurations/devel/Makefile
@@ -1,8 +1,10 @@
 MYIP:=$(shell hostname -i)
 EXISTING_CONTAINER:=$(shell sudo docker ps|grep "xos"|awk '{print $$NF}')
+LAST_CONTAINER=$(shell sudo docker ps -l -q)
 
 test: common_cloudlab
-	cat ../common/Dockerfile.common Dockerfile.devel > Dockerfile
+	echo "# Autogenerated -- do not edit" > Dockerfile
+	cat ../common/Dockerfile.common Dockerfile.devel >> Dockerfile
 	cd ../../..; sudo docker build -t xos -f xos/configurations/devel/Dockerfile .
 	sudo docker run -d --add-host="0.0.0.0:$(MYIP)" -p 9999:8000 xos
 	bash ../common/wait_for_xos.sh
@@ -12,3 +14,9 @@
 
 stop:
 	sudo docker stop $(EXISTING_CONTAINER)
+
+showlogs:
+	sudo docker logs $(LAST_CONTAINER)
+
+enter:
+	sudo docker exec -t -i $(EXISTING_CONTAINER) bash
diff --git a/xos/configurations/frontend/Makefile b/xos/configurations/frontend/Makefile
index 0c1fbc9..e44062d 100644
--- a/xos/configurations/frontend/Makefile
+++ b/xos/configurations/frontend/Makefile
@@ -17,3 +17,5 @@
 showlogs:
 	sudo docker logs $(LAST_CONTAINER)
 
+enter:
+	sudo docker exec -t -i $(EXISTING_CONTAINER) bash
\ No newline at end of file