diff --git a/testbed/smoke-test/db_configs/mariadb.docker-compose.override.yml b/testbed/smoke-test/db_configs/mariadb.docker-compose.override.yml
new file mode 100644
index 000000000..ad9f8ae09
--- /dev/null
+++ b/testbed/smoke-test/db_configs/mariadb.docker-compose.override.yml
@@ -0,0 +1,19 @@
+services:
+  database:
+    image: mariadb
+    environment:
+      MYSQL_DATABASE: shibui
+      MYSQL_USER: shibui
+      MYSQL_PASSWORD: shibui
+      MYSQL_ROOT_PASSWORD: root
+    healthcheck:
+      test: mysql -u shibui --password=shibui shibui -e "select 1"
+      interval: 5s
+      retries: 5
+      start_period: 5s
+      timeout: 10s
+  shib-idp-ui:
+    depends_on:
+      database:
+        condition: service_healthy
+      
\ No newline at end of file
diff --git a/testbed/smoke-test/db_configs/mariadb.yml b/testbed/smoke-test/db_configs/mariadb.yml
new file mode 100644
index 000000000..9b64f680f
--- /dev/null
+++ b/testbed/smoke-test/db_configs/mariadb.yml
@@ -0,0 +1,13 @@
+spring:
+  profiles:
+    include:
+  datasource:
+    platform: mysql
+    driver-class-name: com.mariadb.jdbc.Driver
+    url: jdbc:mariadb://database:3306/shibui
+    username: shibui
+    password: shibui
+  jpa:
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.MariaDB103Dialect
diff --git a/testbed/smoke-test/db_configs/mysql.docker-compose.override.yml b/testbed/smoke-test/db_configs/mysql.docker-compose.override.yml
new file mode 100644
index 000000000..6d511c7e6
--- /dev/null
+++ b/testbed/smoke-test/db_configs/mysql.docker-compose.override.yml
@@ -0,0 +1,19 @@
+services:
+  database:
+    image: mysql
+    environment:
+      MYSQL_DATABASE: shibui
+      MYSQL_USER: shibui
+      MYSQL_PASSWORD: shibui
+      MYSQL_ROOT_PASSWORD: root
+    healthcheck:
+      test: mysql -u shibui --password=shibui shibui -e "select 1"
+      interval: 5s
+      retries: 5
+      start_period: 5s
+      timeout: 10s
+  shib-idp-ui:
+    depends_on:
+      database:
+        condition: service_healthy
+        
\ No newline at end of file
diff --git a/testbed/smoke-test/db_configs/mysql.yml b/testbed/smoke-test/db_configs/mysql.yml
new file mode 100644
index 000000000..b3d434d8a
--- /dev/null
+++ b/testbed/smoke-test/db_configs/mysql.yml
@@ -0,0 +1,13 @@
+spring:
+  profiles:
+    include:
+  datasource:
+    platform: mysql
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://database:3306/shibui
+    username: shibui
+    password: shibui
+  jpa:
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.MySQL8Dialect
diff --git a/testbed/smoke-test/db_configs/postgres.yml b/testbed/smoke-test/db_configs/postgres.yml
new file mode 100644
index 000000000..c9117f2e5
--- /dev/null
+++ b/testbed/smoke-test/db_configs/postgres.yml
@@ -0,0 +1,13 @@
+spring:
+  profiles:
+    include:
+  datasource:
+    platform: postgres
+    driver-class-name: org.postgresql.Driver
+    url: jdbc:postgresql://database:5432/shibui
+    username: shibui
+    password: shibui
+  jpa:
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.PostgreSQLDialect
\ No newline at end of file
diff --git a/testbed/smoke-test/db_configs/sqlServer.docker-compose.override.yml b/testbed/smoke-test/db_configs/sqlServer.docker-compose.override.yml
new file mode 100644
index 000000000..13d5a0670
--- /dev/null
+++ b/testbed/smoke-test/db_configs/sqlServer.docker-compose.override.yml
@@ -0,0 +1,17 @@
+services:
+  database:
+    build:
+      context: ../sqlServer
+      dockerfile: ../sqlServer/docker/Dockerfile
+    image: smoke-test_database
+#    healthcheck:
+#      test: mysql -u shibui --password=shibui shibui -e "select 1"
+#      interval: 5s
+#      retries: 5
+#      start_period: 5s
+#      timeout: 10s
+#  shib-idp-ui:
+#    depends_on:
+#      database:
+#        condition: service_healthy
+        
\ No newline at end of file
diff --git a/testbed/smoke-test/db_configs/sqlServer.yml b/testbed/smoke-test/db_configs/sqlServer.yml
new file mode 100644
index 000000000..d6e7a3e68
--- /dev/null
+++ b/testbed/smoke-test/db_configs/sqlServer.yml
@@ -0,0 +1,13 @@
+spring:
+  profiles:
+    include:
+  datasource:
+    platform: sqlserver
+    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+    url: jdbc:sqlserver://database:1433
+    username: sa
+    password: Password1
+  jpa:
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.SQLServerDialect
\ No newline at end of file
diff --git a/testbed/smoke-test/docker-compose.yml b/testbed/smoke-test/docker-compose.yml
index 0c92cad01..9e2ac5340 100644
--- a/testbed/smoke-test/docker-compose.yml
+++ b/testbed/smoke-test/docker-compose.yml
@@ -37,6 +37,14 @@ services:
       LDAP_DOMAIN: "unicon.local"
       HOSTNAME: "directory"
       LDAP_TLS_VERIFY_CLIENT: "try"
+  database:
+    image: postgres:14-alpine
+    networks:
+      - backend
+    environment:
+      POSTGRES_PASSWORD: shibui
+      POSTGRES_USER: shibui
+      POSTGRES_DB: shibui
   idp:
     build: ../integration/shibboleth-idp
     labels:
@@ -70,6 +78,9 @@ services:
       - "traefik.http.routers.shibui.tls=true"
       - "traefik.docker.network=smoke-test_reverse-proxy"
       - "traefik.enable=true"
+    depends_on:
+      database:
+        condition: service_started
     networks:
       - reverse-proxy
       - backend
@@ -81,16 +92,7 @@ services:
       - ../integration/shibboleth-idp/credentials/shib-idp/inc-md-cert-mdq.pem:/opt/shibboleth-idp/credentials/inc-md-cert-mdq.pem
     environment:
       - "IDP_HOME=/opt/shibboleth-idp"
-  database:
-    image: postgres:14-alpine
-    environment:
-      POSTGRES_PASSWORD: shibui
-      POSTGRES_USER: shibui
-      POSTGRES_DB: shibui
-    networks:
-      - backend
-    volumes:
-      - database_data:/var/lib/postgresql/data
+      
 networks:
   reverse-proxy:
   idp:
diff --git a/testbed/smoke-test/setdb.sh b/testbed/smoke-test/setdb.sh
new file mode 100755
index 000000000..e4347a298
--- /dev/null
+++ b/testbed/smoke-test/setdb.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+DB=$1
+
+if [[ ! "$DB" =~ ^(postgres|mariadb|mysql|sqlServer)$ ]];
+then
+    echo "argument mst be one of: postgres mariadb mysql sqlServer"
+    exit 0;
+fi
+
+if [[ $DB == "postgres" ]];
+then
+rm -f docker-compose.override.yml
+else
+rm -f docker-compose.override.yml
+ln -s db_configs/$DB.docker-compose.override.yml docker-compose.override.yml
+fi
+
+rm -f shibui/application.yml
+cat shibui/application.yml.nodb db_configs/$DB.yml >> shibui/application.yml
+
+echo "shibui will now use the $DB container"
diff --git a/testbed/smoke-test/shibui/application.yml b/testbed/smoke-test/shibui/application.yml
index 126256f0d..df9137c0b 100644
--- a/testbed/smoke-test/shibui/application.yml
+++ b/testbed/smoke-test/shibui/application.yml
@@ -1,18 +1,5 @@
 server:
   forward-headers-strategy: NATIVE
-spring:
-  profiles:
-    include:
-  datasource:
-    platform: postgres
-    driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://database:5432/shibui
-    username: shibui
-    password: shibui
-  jpa:
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.PostgreSQLDialect
 shibui:
   default-password: "{noop}letmein7"
   metadata-dir: /var/shibboleth/dynamic_metadata
@@ -38,3 +25,16 @@ shibui:
       email: urn:oid:0.9.2342.19200300.100.1.3
       groups: urn:oid:2.5.4.15  # businessCategory
       roles: urn:oid:1.3.6.1.4.1.5923.1.1.1.7  # eduPersonEntitlement
+spring:
+  profiles:
+    include:
+  datasource:
+    platform: postgres
+    driver-class-name: org.postgresql.Driver
+    url: jdbc:postgresql://database:5432/shibui
+    username: shibui
+    password: shibui
+  jpa:
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.PostgreSQLDialect
\ No newline at end of file
diff --git a/testbed/smoke-test/shibui/application.yml.nodb b/testbed/smoke-test/shibui/application.yml.nodb
new file mode 100644
index 000000000..b4a070c2c
--- /dev/null
+++ b/testbed/smoke-test/shibui/application.yml.nodb
@@ -0,0 +1,27 @@
+server:
+  forward-headers-strategy: NATIVE
+shibui:
+  default-password: "{noop}letmein7"
+  metadata-dir: /var/shibboleth/dynamic_metadata
+  metadataProviders:
+    target: file:/var/shibboleth/dynamic_config/metadata-providers.xml
+  user-bootstrap-resource: file:/conf/users.csv
+  roles: ROLE_ADMIN,ROLE_NONE,ROLE_USER,ROLE_ENABLE,ROLE_PONY
+  pac4j-enabled: true
+  pac4j:
+    keystorePath: "/conf/samlKeystore.jks"
+    keystorePassword: "changeit"
+    privateKeyPassword: "changeit"
+    serviceProviderEntityId: "https://unicon.net/test/shibui"
+    serviceProviderMetadataPath: "/conf/sp-metadata.xml"
+    identityProviderMetadataPath: "/conf/idp-metadata.xml"
+    forceServiceProviderMetadataGeneration: true
+    callbackUrl: "https://shibui.unicon.local/callback"
+    maximumAuthenticationLifetime: 3600000
+    simpleProfileMapping:
+      username: urn:oid:0.9.2342.19200300.100.1.1
+      firstName: urn:oid:2.5.4.42
+      lastName: urn:oid:2.5.4.4
+      email: urn:oid:0.9.2342.19200300.100.1.3
+      groups: urn:oid:2.5.4.15  # businessCategory
+      roles: urn:oid:1.3.6.1.4.1.5923.1.1.1.7  # eduPersonEntitlement