diff --git a/containers/xos/Makefile b/containers/xos/Makefile
index 7731152..ce5da56 100644
--- a/containers/xos/Makefile
+++ b/containers/xos/Makefile
@@ -1,5 +1,17 @@
-.PHONY: build
-build: ; docker build --rm -t xos/python_common .
+CONTAINER_NAME:=xos-server
+TOSCA_CONFIG_PATH:=/opt/xos/configurations/xos/opencloud.yaml
 
-.PHONY: rmi
-rm: ; docker rmi xos/python_common
+.PHONY: build
+build: ; docker build --rm -t xos .
+
+.PHONY: run
+run: ; docker run --rm  --name ${CONTAINER_NAME} -p 80:8000 xos
+
+.PHONY: runtosca
+runtosca: ; docker exec -it ${CONTAINER_NAME} /usr/bin/python /opt/xos/tosca/run.py padmin@vicci.org ${TOSCA_CONFIG_PATH}
+
+.PHONY: stop
+stop: ; docker stop ${CONTAINER_NAME}
+
+.PHONY: rmcontainer
+rmcontainer: ; docker rm ${CONTAINER_NAME}