diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml
index f78ed2c5..5f893635 100644
--- a/.github/workflows/build_test_deploy.yml
+++ b/.github/workflows/build_test_deploy.yml
@@ -152,7 +152,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: ["core", "fetchmail", "filters", "rainloop", "roundcube", "webdav"]
+        target: ["core", "fetchmail", "filters", "snappymail", "roundcube", "webdav"]
         time: ["2"]
         include:
           - target: "filters"
@@ -197,7 +197,7 @@ jobs:
             *.cache-from=type=gha,scope=build-front
             *.cache-from=type=gha,scope=build-imap
             *.cache-from=type=gha,scope=build-smtp
-            *.cache-from=type=gha,scope=build-rainloop
+            *.cache-from=type=gha,scope=build-snappymail
             *.cache-from=type=gha,scope=build-roundcube
             *.cache-from=type=gha,scope=build-antivirus
             *.cache-from=type=gha,scope=build-fetchmail
@@ -262,7 +262,7 @@ jobs:
             *.cache-from=type=gha,scope=build-front
             *.cache-from=type=gha,scope=build-imap
             *.cache-from=type=gha,scope=build-smtp
-            *.cache-from=type=gha,scope=build-rainloop
+            *.cache-from=type=gha,scope=build-snappymail
             *.cache-from=type=gha,scope=build-roundcube
             *.cache-from=type=gha,scope=build-antivirus
             *.cache-from=type=gha,scope=build-fetchmail
@@ -314,7 +314,7 @@ jobs:
             *.cache-from=type=gha,scope=build-front
             *.cache-from=type=gha,scope=build-imap
             *.cache-from=type=gha,scope=build-smtp
-            *.cache-from=type=gha,scope=build-rainloop
+            *.cache-from=type=gha,scope=build-snappymail
             *.cache-from=type=gha,scope=build-roundcube
             *.cache-from=type=gha,scope=build-antivirus
             *.cache-from=type=gha,scope=build-fetchmail
diff --git a/tests/build.hcl b/tests/build.hcl
index 4db636df..3df00b51 100644
--- a/tests/build.hcl
+++ b/tests/build.hcl
@@ -36,7 +36,7 @@ group "default" {
     "imap",
     "smtp",
 
-    "rainloop",
+    "snappymail",
     "roundcube",
 
     "antivirus",
@@ -139,10 +139,10 @@ target "smtp" {
 # -----------------------------------------------------------------------------------------
 # Webmail images
 # -----------------------------------------------------------------------------------------
-target "rainloop" {
+target "snappymail" {
   inherits = ["defaults"]
-  context="webmails/rainloop"
-  tags = tag("rainloop")
+  context="webmails/snappymail"
+  tags = tag("snappymail")
 }
 
 target "roundcube" {