diff --git a/.gitignore b/.gitignore
index c2b017df3..22527af4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@ drone/drone
 *.sqlite
 *.txt
 *.out
-.env
+/.env
 extras/
 release/
 cli/release/
diff --git a/cncd/pipeline/samples/sample_1/.env b/cncd/pipeline/samples/sample_1/.env
new file mode 100644
index 000000000..50dfaf1b8
--- /dev/null
+++ b/cncd/pipeline/samples/sample_1/.env
@@ -0,0 +1,17 @@
+CI_REPO=drone/envsubst
+CI_REPO_NAME=drone/envsubst
+CI_REPO_LINK=https://github.com/drone/envsubst
+CI_REPO_REMOTE=https://github.com/drone/envsubst.git
+CI_REPO_PRIVATE=false
+CI_BUILD_NUMBER=6
+CI_BUILD_CREATED=1486119586
+CI_BUILD_STARTED=1486119585
+CI_BUILD_EVENT=push
+CI_BUILD_LINK=
+CI_COMMIT_SHA=d0876d3176965f9552a611cbd56e24a9264355e6
+CI_COMMIT_REF=refs/heads/master
+CI_COMMIT_REFSPEC=
+CI_COMMIT_BRANCH=master
+CI_COMMIT_MESSAGE="added a few more test cases for escaping behavior"
+CI_COMMIT_AUTHOR=bradrydzewski
+CI_COMMIT_AUTHOR_NAME=bradrydzewski
diff --git a/cncd/pipeline/samples/sample_10_windows/.env b/cncd/pipeline/samples/sample_10_windows/.env
new file mode 100644
index 000000000..50dfaf1b8
--- /dev/null
+++ b/cncd/pipeline/samples/sample_10_windows/.env
@@ -0,0 +1,17 @@
+CI_REPO=drone/envsubst
+CI_REPO_NAME=drone/envsubst
+CI_REPO_LINK=https://github.com/drone/envsubst
+CI_REPO_REMOTE=https://github.com/drone/envsubst.git
+CI_REPO_PRIVATE=false
+CI_BUILD_NUMBER=6
+CI_BUILD_CREATED=1486119586
+CI_BUILD_STARTED=1486119585
+CI_BUILD_EVENT=push
+CI_BUILD_LINK=
+CI_COMMIT_SHA=d0876d3176965f9552a611cbd56e24a9264355e6
+CI_COMMIT_REF=refs/heads/master
+CI_COMMIT_REFSPEC=
+CI_COMMIT_BRANCH=master
+CI_COMMIT_MESSAGE="added a few more test cases for escaping behavior"
+CI_COMMIT_AUTHOR=bradrydzewski
+CI_COMMIT_AUTHOR_NAME=bradrydzewski
diff --git a/cncd/pipeline/samples/sample_2/.env b/cncd/pipeline/samples/sample_2/.env
new file mode 100644
index 000000000..b4799f93f
--- /dev/null
+++ b/cncd/pipeline/samples/sample_2/.env
@@ -0,0 +1,17 @@
+CI_REPO=go-sql-driver/mysql
+CI_REPO_NAME=go-sql-driver/mysql
+CI_REPO_LINK=https://github.com/go-sql-driver/mysql
+CI_REPO_REMOTE=https://github.com/go-sql-driver/mysql.git
+CI_REPO_PRIVATE=false
+CI_BUILD_NUMBER=530
+CI_BUILD_CREATED=1486119586
+CI_BUILD_STARTED=1486119585
+CI_BUILD_EVENT=push
+CI_BUILD_LINK=
+CI_COMMIT_SHA=2e00b5cd70399450106cec6431c2e2ce3cae5034
+CI_COMMIT_REF=refs/heads/master
+CI_COMMIT_REFSPEC=
+CI_COMMIT_BRANCH=master
+CI_COMMIT_MESSAGE="Fix many urls"
+CI_COMMIT_AUTHOR=egorsmkv
+CI_COMMIT_AUTHOR_NAME=egorsmkv
diff --git a/cncd/pipeline/samples/sample_3/.env b/cncd/pipeline/samples/sample_3/.env
new file mode 100644
index 000000000..4c1e6ca4b
--- /dev/null
+++ b/cncd/pipeline/samples/sample_3/.env
@@ -0,0 +1,18 @@
+CI_REPO=drone/envsubst
+CI_REPO_NAME=drone/envsubst
+CI_REPO_LINK=https://github.com/drone/envsubst
+CI_REPO_REMOTE=https://github.com/drone/envsubst.git
+CI_REPO_PRIVATE=false
+CI_BUILD_NUMBER=6
+CI_BUILD_CREATED=1486119586
+CI_BUILD_STARTED=1486119585
+CI_BUILD_EVENT=push
+CI_BUILD_LINK=
+CI_COMMIT_SHA=d0876d3176965f9552a611cbd56e24a9264355e6
+CI_COMMIT_REF=refs/heads/master
+CI_COMMIT_REFSPEC=
+CI_COMMIT_BRANCH=master
+CI_COMMIT_MESSAGE="added a few more test cases for escaping behavior"
+CI_COMMIT_AUTHOR=bradrydzewski
+CI_COMMIT_AUTHOR_NAME=bradrydzewski
+
diff --git a/cncd/pipeline/samples/sample_4/.env b/cncd/pipeline/samples/sample_4/.env
new file mode 100644
index 000000000..50dfaf1b8
--- /dev/null
+++ b/cncd/pipeline/samples/sample_4/.env
@@ -0,0 +1,17 @@
+CI_REPO=drone/envsubst
+CI_REPO_NAME=drone/envsubst
+CI_REPO_LINK=https://github.com/drone/envsubst
+CI_REPO_REMOTE=https://github.com/drone/envsubst.git
+CI_REPO_PRIVATE=false
+CI_BUILD_NUMBER=6
+CI_BUILD_CREATED=1486119586
+CI_BUILD_STARTED=1486119585
+CI_BUILD_EVENT=push
+CI_BUILD_LINK=
+CI_COMMIT_SHA=d0876d3176965f9552a611cbd56e24a9264355e6
+CI_COMMIT_REF=refs/heads/master
+CI_COMMIT_REFSPEC=
+CI_COMMIT_BRANCH=master
+CI_COMMIT_MESSAGE="added a few more test cases for escaping behavior"
+CI_COMMIT_AUTHOR=bradrydzewski
+CI_COMMIT_AUTHOR_NAME=bradrydzewski
diff --git a/cncd/pipeline/samples/sample_5/.env b/cncd/pipeline/samples/sample_5/.env
new file mode 100644
index 000000000..50dfaf1b8
--- /dev/null
+++ b/cncd/pipeline/samples/sample_5/.env
@@ -0,0 +1,17 @@
+CI_REPO=drone/envsubst
+CI_REPO_NAME=drone/envsubst
+CI_REPO_LINK=https://github.com/drone/envsubst
+CI_REPO_REMOTE=https://github.com/drone/envsubst.git
+CI_REPO_PRIVATE=false
+CI_BUILD_NUMBER=6
+CI_BUILD_CREATED=1486119586
+CI_BUILD_STARTED=1486119585
+CI_BUILD_EVENT=push
+CI_BUILD_LINK=
+CI_COMMIT_SHA=d0876d3176965f9552a611cbd56e24a9264355e6
+CI_COMMIT_REF=refs/heads/master
+CI_COMMIT_REFSPEC=
+CI_COMMIT_BRANCH=master
+CI_COMMIT_MESSAGE="added a few more test cases for escaping behavior"
+CI_COMMIT_AUTHOR=bradrydzewski
+CI_COMMIT_AUTHOR_NAME=bradrydzewski
diff --git a/cncd/pipeline/samples/sample_6/.env b/cncd/pipeline/samples/sample_6/.env
new file mode 100644
index 000000000..0ca9981bb
--- /dev/null
+++ b/cncd/pipeline/samples/sample_6/.env
@@ -0,0 +1,25 @@
+CI_REPO=drone/envsubst
+CI_REPO_NAME=drone/envsubst
+CI_REPO_LINK=https://github.com/drone/envsubst
+CI_REPO_REMOTE=https://github.com/drone/envsubst.git
+CI_REPO_PRIVATE=false
+CI_BUILD_NUMBER=6
+CI_BUILD_CREATED=1486119586
+CI_BUILD_STARTED=1486119585
+CI_BUILD_EVENT=push
+CI_BUILD_LINK=
+CI_COMMIT_SHA=d0876d3176965f9552a611cbd56e24a9264355e6
+CI_COMMIT_REF=refs/heads/master
+CI_COMMIT_REFSPEC=
+CI_COMMIT_BRANCH=master
+CI_COMMIT_MESSAGE="added a few more test cases for escaping behavior"
+CI_COMMIT_AUTHOR=bradrydzewski
+CI_COMMIT_AUTHOR_NAME=bradrydzewski
+
+# custom secrets
+SLACK_WEBHOOK=https://slack.com/hooks/xxxxxxxx/yyyyyyyyy
+
+# registry secrets
+CI_REGISTRY_HOSTNAME=docker.io
+CI_REGISTRY_USERNAME=gordon
+CI_REGISTRY_PASSWORD=password
diff --git a/cncd/pipeline/samples/sample_9_cache/.env b/cncd/pipeline/samples/sample_9_cache/.env
new file mode 100644
index 000000000..0b18c3559
--- /dev/null
+++ b/cncd/pipeline/samples/sample_9_cache/.env
@@ -0,0 +1,21 @@
+CI_REPO=drone/envsubst
+CI_REPO_NAME=drone/envsubst
+CI_REPO_LINK=https://github.com/drone/envsubst
+CI_REPO_REMOTE=https://github.com/drone/envsubst.git
+CI_REPO_PRIVATE=false
+CI_BUILD_NUMBER=6
+CI_BUILD_CREATED=1486119586
+CI_BUILD_STARTED=1486119585
+CI_BUILD_EVENT=push
+CI_BUILD_LINK=
+CI_COMMIT_SHA=d0876d3176965f9552a611cbd56e24a9264355e6
+CI_COMMIT_REF=refs/heads/master
+CI_COMMIT_REFSPEC=
+CI_COMMIT_BRANCH=master
+CI_COMMIT_MESSAGE="added a few more test cases for escaping behavior"
+CI_COMMIT_AUTHOR=bradrydzewski
+CI_COMMIT_AUTHOR_NAME=bradrydzewski
+
+CI_VOLUME_CACHE=true
+CI_VOLUME_CACHE_BASE=/cache/drone
+