diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b48a546de3a164774b37b7b90b9c541e60ff2a2a..862e22d58c175f6b9f11fea95137a600b322e590 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,6 +5,39 @@ before_script:
 after_script:
   - "echo Test Complete."
 
+stages:
+  - clean
+  - build
+  - test
+
+
+
+#
+# Cleaning
+#
+
+#template 
+.do-clean: &do-clean
+  stage: clean
+  script:
+    - ./cicd_tests/do-clean.sh
+
+# per os items
+do-clean-ubuntu18:
+  <<: *do-clean
+  tags:
+    - ubuntu18
+  variables:
+    OS: 'ubuntu18'  
+
+# per os items
+do-clean-ubuntu16:
+  <<: *do-clean
+  tags:
+    - ubuntu18
+  variables:
+    OS: 'ubuntu16'  
+
 
 #
 # building 
@@ -16,9 +49,6 @@ after_script:
   stage: build
   script:
     - ./cicd_tests/do-build.sh
-  artifacts:
-    paths:
-    -  "./ps-install-*"
 
 
 # per os items
diff --git a/cicd_tests/do-build.sh b/cicd_tests/do-build.sh
index 987f9af1319dd1844c2e00354f2dbdd29bfb4073..a08d17dd61616191eda2e4683ba6375a9a3fd31c 100755
--- a/cicd_tests/do-build.sh
+++ b/cicd_tests/do-build.sh
@@ -29,8 +29,6 @@ main()
 	dropdb $PGDATABASE 2>/dev/null || true ; ./postgres_setup.sh
 
 	cd $orig_dir
-	rm -rf ps-install-$OS
-	cp -R $CICD_MODULE_WORK_DIR/peasoup_umbrella/installed ps-install-$OS
 }
 
 main "$@"
diff --git a/cicd_tests/do-clean.sh b/cicd_tests/do-clean.sh
new file mode 100755
index 0000000000000000000000000000000000000000..a6b66decb247d9b9f8d1e85ba268c2f8bca0fc01
--- /dev/null
+++ b/cicd_tests/do-clean.sh
@@ -0,0 +1,22 @@
+#/bin/bash 
+
+set -e
+set -x
+
+main()
+{
+
+	# gather info for debugging later, probably not necessary 
+	pwd
+	hostname
+	whoami
+	env|grep CICD
+
+
+	if [[ $CICD_NIGHTLY == 1 ]] ; then
+		rm -rf $CICD_MODULE_WORK_DIR/peasoup_umbrella
+	fi
+
+}
+
+main "$@"