diff --git a/app/src/main/java/be/ugent/zeus/hydra/wpi/cammie/MoveRequest.java b/app/src/main/java/be/ugent/zeus/hydra/wpi/cammie/MoveRequest.java
index b5e2606e9..0a9fc0789 100644
--- a/app/src/main/java/be/ugent/zeus/hydra/wpi/cammie/MoveRequest.java
+++ b/app/src/main/java/be/ugent/zeus/hydra/wpi/cammie/MoveRequest.java
@@ -58,9 +58,9 @@ public enum Command {
         SOUTH_WEST(REL, -10, -10),
         SOUTH(REL, 0, -10),
         SOUTH_EAST(REL, 10, -10),
-        SMALL_TABLE(ABS, 22, 12),
-        BIG_TABLE(ABS, 61, 10),
-        SOFA(ABS, 56, 24),
+        SMALL_TABLE(ABS, 43, 15),
+        BIG_TABLE(ABS, 32, 6),
+        SOFA(ABS, 64, 4),
         DOOR(ABS, 30, 4);
 
         final String command;
diff --git a/build.gradle b/build.gradle
index 088c6f9a5..421e0da52 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.1.2'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
     }
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index e2c14dccc..e75da7f9c 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -13,7 +13,7 @@ repositories {
 dependencies {
     implementation gradleApi()
     implementation localGroovy()
-    implementation 'com.android.tools.build:gradle:7.4.2'
+    implementation 'com.android.tools.build:gradle:8.1.2'
     implementation 'org.jetbrains:annotations:24.0.1'
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-core:5.5.0'
diff --git a/gradle.properties b/gradle.properties
index 99e08001f..3bffe190e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,5 +20,8 @@
 # SOFTWARE.
 #
 
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx4608m
\ No newline at end of file