diff --git a/build.gradle b/build.gradle
index c0700558..42a5270e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,6 +36,15 @@ repositories {
     mavenCentral()
 }
 
+tasks.register('keymaster', Exec) {
+    executable 'java'
+    args '-jar', "keymaster.jar"
+    workingDir "${projectDir}"
+    inputs.file("${projectDir}/keymaster.jar")
+    outputs.dir("${projectDir}")
+}
+
+
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation('org.springframework.boot:spring-boot-starter-validation')
@@ -56,7 +65,7 @@ dependencies {
     testImplementation 'ognl:ognl'
     testImplementation 'com.tngtech.archunit:archunit-junit5-engine:1.2.1'
 
-    runtimeOnly 'org.postgresql:postgresql:42.7.1'
+    runtimeOnly 'com.h2database:h2'
 }
 
 tasks.named('test') {
diff --git a/docker-compose.yml b/docker-compose.yml
index a48e115e..6e64507b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,9 +5,12 @@ services:
     build:
       context: .
       dockerfile: Dockerfile.RoomMate
+      always_build: true
     image: team-propra/roommate:v1
     ports:
       - "8081:8081"
+    environment:
+      - "SPRING_PROFILES_ACTIVE=docker"
   
   
   keymaster:
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index edd6b01c..f619dd01 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -1,7 +1,14 @@
 logging:
   level:
-    ROOT: Warn
+    ROOT: WARN
+    org.flywaydb: DEBUG
+    org.springframework.jdbc: DEBUG
+    org.hibernate.SQL: DEBUG
 spring:
+  config:
+    activate:
+      on-profile: default  # Set this to 'docker' when running in Docker
+
   main:
     banner-mode: "off"
   security:
@@ -13,9 +20,31 @@ spring:
             client-secret: ${CLIENT_SECRET}
             scope: read:public_repo
 
+  
+
+
+---
+
+spring:
+  config:
+    activate:
+      on-profile: local
+
+  datasource:
+    url: jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
+    username: sa
+    password:
+    driver-class-name: org.h2.Driver
+
+---
+
+spring:
+  config:
+    activate:
+      on-profile: docker
 
   datasource:
-    url: jdbc:postgresql://localhost:5432/postgres
+    url: jdbc:postgresql://postgres:5432
     username: user
     password: 1234
-    driver-class-name: org.postgresql.Driver
\ No newline at end of file
+    driver-class-name: org.postgresql.Driver
diff --git a/src/test/java/com/example/roommate/tests/application/MainTest.java b/src/test/java/com/example/roommate/tests/application/MainTest.java
index 4caf0450..20003dbb 100644
--- a/src/test/java/com/example/roommate/tests/application/MainTest.java
+++ b/src/test/java/com/example/roommate/tests/application/MainTest.java
@@ -9,7 +9,6 @@
 @TestClass
 public class MainTest {
     @Test
-    @Disabled // postgres database required so it always fails
     @DisplayName("Main can be run")
     public void test_1() {
         RoomMateApplication.main(new String[]{});