diff --git a/gocd/slfo-stagings.gocd.yaml b/gocd/slfo-stagings.gocd.yaml
index 5eac64bf..bbea109c 100644
--- a/gocd/slfo-stagings.gocd.yaml
+++ b/gocd/slfo-stagings.gocd.yaml
@@ -59,13 +59,18 @@ pipelines:
               fi
 
     - Build.product:
+        timeout: 180
         resources:
           - staging-bot
         tasks:
           - script: |-
               osc -A $STAGING_API api -X POST "/source/$STAGING_PROJECT?cmd=remove_flag&repository=product&flag=build"
               export PYTHONPATH=$PWD/scripts
-              while ! ./scripts/gocd/verify-repo-built-successful.py -A $STAGING_API -p $STAGING_PROJECT -r product; do
+              while ./scripts/gocd/verify-repo-built-successful.py -A $STAGING_API -p $STAGING_PROJECT -r product; ret=$?; [ ${ret} -ne 0 ]; do
+                if [ ${ret} -eq 2 ]; then
+                    echo "product repository not found. Project configuration issue?" >&2
+                    exit 1
+                fi
                 sleep 60
               done
 
@@ -138,13 +143,18 @@ pipelines:
               fi
 
     - Build.product:
+        timeout: 180
         resources:
           - staging-bot
         tasks:
           - script: |-
               osc -A $STAGING_API api -X POST "/source/$STAGING_PROJECT?cmd=remove_flag&repository=product&flag=build"
               export PYTHONPATH=$PWD/scripts
-              while ! ./scripts/gocd/verify-repo-built-successful.py -A $STAGING_API -p $STAGING_PROJECT -r product; do
+              while ./scripts/gocd/verify-repo-built-successful.py -A $STAGING_API -p $STAGING_PROJECT -r product; ret=$?; [ ${ret} -ne 0 ]; do
+                if [ ${ret} -eq 2 ]; then
+                    echo "product repository not found. Project configuration issue?" >&2
+                    exit 1
+                fi
                 sleep 60
               done
 
@@ -217,13 +227,18 @@ pipelines:
               fi
 
     - Build.product:
+        timeout: 180
         resources:
           - staging-bot
         tasks:
           - script: |-
               osc -A $STAGING_API api -X POST "/source/$STAGING_PROJECT?cmd=remove_flag&repository=product&flag=build"
               export PYTHONPATH=$PWD/scripts
-              while ! ./scripts/gocd/verify-repo-built-successful.py -A $STAGING_API -p $STAGING_PROJECT -r product; do
+              while ./scripts/gocd/verify-repo-built-successful.py -A $STAGING_API -p $STAGING_PROJECT -r product; ret=$?; [ ${ret} -ne 0 ]; do
+                if [ ${ret} -eq 2 ]; then
+                    echo "product repository not found. Project configuration issue?" >&2
+                    exit 1
+                fi
                 sleep 60
               done
 
@@ -296,13 +311,18 @@ pipelines:
               fi
 
     - Build.product:
+        timeout: 180
         resources:
           - staging-bot
         tasks:
           - script: |-
               osc -A $STAGING_API api -X POST "/source/$STAGING_PROJECT?cmd=remove_flag&repository=product&flag=build"
               export PYTHONPATH=$PWD/scripts
-              while ! ./scripts/gocd/verify-repo-built-successful.py -A $STAGING_API -p $STAGING_PROJECT -r product; do
+              while ./scripts/gocd/verify-repo-built-successful.py -A $STAGING_API -p $STAGING_PROJECT -r product; ret=$?; [ ${ret} -ne 0 ]; do
+                if [ ${ret} -eq 2 ]; then
+                    echo "product repository not found. Project configuration issue?" >&2
+                    exit 1
+                fi
                 sleep 60
               done
 
@@ -375,13 +395,18 @@ pipelines:
               fi
 
     - Build.product:
+        timeout: 180
         resources:
           - staging-bot
         tasks:
           - script: |-
               osc -A $STAGING_API api -X POST "/source/$STAGING_PROJECT?cmd=remove_flag&repository=product&flag=build"
               export PYTHONPATH=$PWD/scripts
-              while ! ./scripts/gocd/verify-repo-built-successful.py -A $STAGING_API -p $STAGING_PROJECT -r product; do
+              while ./scripts/gocd/verify-repo-built-successful.py -A $STAGING_API -p $STAGING_PROJECT -r product; ret=$?; [ ${ret} -ne 0 ]; do
+                if [ ${ret} -eq 2 ]; then
+                    echo "product repository not found. Project configuration issue?" >&2
+                    exit 1
+                fi
                 sleep 60
               done
 
@@ -454,13 +479,18 @@ pipelines:
               fi
 
     - Build.product:
+        timeout: 180
         resources:
           - staging-bot
         tasks:
           - script: |-
               osc -A $STAGING_API api -X POST "/source/$STAGING_PROJECT?cmd=remove_flag&repository=product&flag=build"
               export PYTHONPATH=$PWD/scripts
-              while ! ./scripts/gocd/verify-repo-built-successful.py -A $STAGING_API -p $STAGING_PROJECT -r product; do
+              while ./scripts/gocd/verify-repo-built-successful.py -A $STAGING_API -p $STAGING_PROJECT -r product; ret=$?; [ ${ret} -ne 0 ]; do
+                if [ ${ret} -eq 2 ]; then
+                    echo "product repository not found. Project configuration issue?" >&2
+                    exit 1
+                fi
                 sleep 60
               done
 
@@ -533,13 +563,18 @@ pipelines:
               fi
 
     - Build.product:
+        timeout: 180
         resources:
           - staging-bot
         tasks:
           - script: |-
               osc -A $STAGING_API api -X POST "/source/$STAGING_PROJECT?cmd=remove_flag&repository=product&flag=build"
               export PYTHONPATH=$PWD/scripts
-              while ! ./scripts/gocd/verify-repo-built-successful.py -A $STAGING_API -p $STAGING_PROJECT -r product; do
+              while ./scripts/gocd/verify-repo-built-successful.py -A $STAGING_API -p $STAGING_PROJECT -r product; ret=$?; [ ${ret} -ne 0 ]; do
+                if [ ${ret} -eq 2 ]; then
+                    echo "product repository not found. Project configuration issue?" >&2
+                    exit 1
+                fi
                 sleep 60
               done
 
@@ -612,13 +647,18 @@ pipelines:
               fi
 
     - Build.product:
+        timeout: 180
         resources:
           - staging-bot
         tasks:
           - script: |-
               osc -A $STAGING_API api -X POST "/source/$STAGING_PROJECT?cmd=remove_flag&repository=product&flag=build"
               export PYTHONPATH=$PWD/scripts
-              while ! ./scripts/gocd/verify-repo-built-successful.py -A $STAGING_API -p $STAGING_PROJECT -r product; do
+              while ./scripts/gocd/verify-repo-built-successful.py -A $STAGING_API -p $STAGING_PROJECT -r product; ret=$?; [ ${ret} -ne 0 ]; do
+                if [ ${ret} -eq 2 ]; then
+                    echo "product repository not found. Project configuration issue?" >&2
+                    exit 1
+                fi
                 sleep 60
               done
 
@@ -691,13 +731,18 @@ pipelines:
               fi
 
     - Build.product:
+        timeout: 180
         resources:
           - staging-bot
         tasks:
           - script: |-
               osc -A $STAGING_API api -X POST "/source/$STAGING_PROJECT?cmd=remove_flag&repository=product&flag=build"
               export PYTHONPATH=$PWD/scripts
-              while ! ./scripts/gocd/verify-repo-built-successful.py -A $STAGING_API -p $STAGING_PROJECT -r product; do
+              while ./scripts/gocd/verify-repo-built-successful.py -A $STAGING_API -p $STAGING_PROJECT -r product; ret=$?; [ ${ret} -ne 0 ]; do
+                if [ ${ret} -eq 2 ]; then
+                    echo "product repository not found. Project configuration issue?" >&2
+                    exit 1
+                fi
                 sleep 60
               done
 
@@ -770,13 +815,18 @@ pipelines:
               fi
 
     - Build.product:
+        timeout: 180
         resources:
           - staging-bot
         tasks:
           - script: |-
               osc -A $STAGING_API api -X POST "/source/$STAGING_PROJECT?cmd=remove_flag&repository=product&flag=build"
               export PYTHONPATH=$PWD/scripts
-              while ! ./scripts/gocd/verify-repo-built-successful.py -A $STAGING_API -p $STAGING_PROJECT -r product; do
+              while ./scripts/gocd/verify-repo-built-successful.py -A $STAGING_API -p $STAGING_PROJECT -r product; ret=$?; [ ${ret} -ne 0 ]; do
+                if [ ${ret} -eq 2 ]; then
+                    echo "product repository not found. Project configuration issue?" >&2
+                    exit 1
+                fi
                 sleep 60
               done
 
@@ -849,13 +899,18 @@ pipelines:
               fi
 
     - Build.product:
+        timeout: 180
         resources:
           - staging-bot
         tasks:
           - script: |-
               osc -A $STAGING_API api -X POST "/source/$STAGING_PROJECT?cmd=remove_flag&repository=product&flag=build"
               export PYTHONPATH=$PWD/scripts
-              while ! ./scripts/gocd/verify-repo-built-successful.py -A $STAGING_API -p $STAGING_PROJECT -r product; do
+              while ./scripts/gocd/verify-repo-built-successful.py -A $STAGING_API -p $STAGING_PROJECT -r product; ret=$?; [ ${ret} -ne 0 ]; do
+                if [ ${ret} -eq 2 ]; then
+                    echo "product repository not found. Project configuration issue?" >&2
+                    exit 1
+                fi
                 sleep 60
               done
 
diff --git a/gocd/slfo-stagings.gocd.yaml.erb b/gocd/slfo-stagings.gocd.yaml.erb
index 74b685e2..d4395e12 100644
--- a/gocd/slfo-stagings.gocd.yaml.erb
+++ b/gocd/slfo-stagings.gocd.yaml.erb
@@ -60,13 +60,18 @@ pipelines:
               fi
 
     - Build.product:
+        timeout: 180
         resources:
           - staging-bot
         tasks:
           - script: |-
               osc -A $STAGING_API api -X POST "/source/$STAGING_PROJECT?cmd=remove_flag&repository=product&flag=build"
               export PYTHONPATH=$PWD/scripts
-              while ! ./scripts/gocd/verify-repo-built-successful.py -A $STAGING_API -p $STAGING_PROJECT -r product; do
+              while ./scripts/gocd/verify-repo-built-successful.py -A $STAGING_API -p $STAGING_PROJECT -r product; ret=$?; [ ${ret} -ne 0 ]; do
+                if [ ${ret} -eq 2 ]; then
+                    echo "product repository not found. Project configuration issue?" >&2
+                    exit 1
+                fi
                 sleep 60
               done