diff --git a/integration-tests/templates/etlserver-all/etc/service.properties b/integration-tests/templates/etlserver-all/etc/service.properties
index d5f906a70afb22d57829451085b07f6ecb5bee49..4e5558394309a6c1aafefb9a9da43d509f6124f9 100644
--- a/integration-tests/templates/etlserver-all/etc/service.properties
+++ b/integration-tests/templates/etlserver-all/etc/service.properties
@@ -13,9 +13,6 @@ username = etlserver
 # The password to use when contacting the LIMS server
 password = <change this>
 
-# The code of the organization to process data sets
-organization-code = 3V
-
 # SMTP properties (must start with 'mail' to be considered). 
 mail.smtp.host = mail.ethz.ch
 # mail.from = etlserver@localhost
@@ -103,3 +100,4 @@ image-analysis.type-extractor.procedure-type = IMAGE_ANALYSIS
 
 # The storage processor (IStorageProcessor implementation)
 image-analysis.storage-processor = ch.systemsx.cisd.etlserver.DefaultStorageProcessor
+
diff --git a/integration-tests/templates/openBIS-client/.openBIS-default b/integration-tests/templates/openBIS-client/.openBIS-default
index 9baf0a7ecf6e57ecccaccdc8f9e0cb4f585dbc3e..d801b66db7d92c7796d1af69f6bde627829b09f4 100644
--- a/integration-tests/templates/openBIS-client/.openBIS-default
+++ b/integration-tests/templates/openBIS-client/.openBIS-default
@@ -1,2 +1 @@
-base-url=https://localhost:8443/openbis
-organization-code=DEFAULT
\ No newline at end of file
+base-url=https://localhost:8443/openbis
\ No newline at end of file
diff --git a/integration-tests/templates/openBIS-client/check-results.sh b/integration-tests/templates/openBIS-client/check-results.sh
index d660a6ff6288043f2c3228339bb3d141802f1277..1bf432869f0b3ae322c2e4d46ea82707f50e8c93 100755
--- a/integration-tests/templates/openBIS-client/check-results.sh
+++ b/integration-tests/templates/openBIS-client/check-results.sh
@@ -1,4 +1,4 @@
 CL=./bis.sh
-$CL login -o 3V -u test -p unimportant
+$CL login -u test -p unimportant
 $CL get-experiment-info NEMO EXP1
 $CL logout
\ No newline at end of file
diff --git a/integration-tests/templates/openBIS-client/commands.txt b/integration-tests/templates/openBIS-client/commands.txt
index c390164476bfa6cbbae23d81ae3a6f5cfbb89b59..703c697446c73bff24f9c7d0591c6d6a2807988a 100644
--- a/integration-tests/templates/openBIS-client/commands.txt
+++ b/integration-tests/templates/openBIS-client/commands.txt
@@ -1,4 +1,4 @@
-login -o 3V -u test -p <password>
+login -u test -p <password>
 register-project NEMO
 register-master-plate -p INTERNAL.PLATE_GEOMETRY=384_WELLS_16X24 testdata/MP001-1.txt code1
 register-master-plate -p INTERNAL.PLATE_GEOMETRY=384_WELLS_16X24 testdata/MP002-1.txt code2
diff --git a/integration-tests/templates/openBIS-server/service.properties b/integration-tests/templates/openBIS-server/service.properties
index 03b292bc5bfd6c68c949c49e0d8c07f131097d70..bbb0d3d84f46b6ba90924517f3e1a2416a0f59c2 100644
--- a/integration-tests/templates/openBIS-server/service.properties
+++ b/integration-tests/templates/openBIS-server/service.properties
@@ -34,4 +34,10 @@ processing-instruction.IMAGE_ANALYSIS.prefix-for-absolute-paths =
 processing-instruction.IMAGE_ANALYSIS.prefix-for-relative-paths =
 
 # The time after which an inactive session is expired by the service (in minutes).
-session-timeout = 30
\ No newline at end of file
+session-timeout = 30
+
+# Group identifier (mandatory).
+group-code = CISD
+
+# Workflow code name (mandatory; available values: strict, plates-on-demand)
+workflow-code = strict
\ No newline at end of file