diff --git a/ci-scripts/Jenkinsfile-GitLab-Docker b/ci-scripts/Jenkinsfile-GitLab-Docker
index fe57ed0c4fa7cfe7f8b255056995d752196a7978..2107b22fc2b05ae515be9ac79276bd76cf36c1b5 100644
--- a/ci-scripts/Jenkinsfile-GitLab-Docker
+++ b/ci-scripts/Jenkinsfile-GitLab-Docker
@@ -60,11 +60,11 @@ def scmEvent = false
 def upstreamEvent = false
 
 // Default tags / branches  --> could be passed on by upstream job or by PR content
-def nrfTag = 'dockerfile'
-def nrfBranch = 'dockerfile'
-def amfTag = 'nrf-com'
+def nrfTag = 'develop'
+def nrfBranch = 'develop'
+def amfTag = 'develop'
 def amfBranch = 'develop'
-def smfTag = 'dockerfile'
+def smfTag = 'develop'
 def smfBranch = 'develop'
 def spgwuTag = 'nrf-com'
 def spgwuBranch = 'master'
diff --git a/ci-scripts/dsTestGenerateHTMLReport.py b/ci-scripts/dsTestGenerateHTMLReport.py
index 7b0defb8968f64205b6f092406f5fd189c3bf613..37cfaa62b9ea07d81f443d150f61ab9e0e56956f 100644
--- a/ci-scripts/dsTestGenerateHTMLReport.py
+++ b/ci-scripts/dsTestGenerateHTMLReport.py
@@ -44,10 +44,9 @@ class HtmlReport():
 		self.generateFooter()
 		self.file.close()
 
-		try:
-			if finalStatus:
-				sys.exit(0)
-		except:
+		if finalStatus:
+			sys.exit(0)
+		else:
 			print("DS-TESTER testing FAILED")
 
 	def generateHeader(self):