diff --git a/jreleaser.yml b/jreleaser.yml
index 57d4f68f0..2e7ea23be 100644
--- a/jreleaser.yml
+++ b/jreleaser.yml
@@ -166,6 +166,24 @@ assemble:
 
 distributions:
   riot:
+    scoop:
+      active: ALWAYS
+      continueOnError: true
+      repository:
+        active: RELEASE
+        name: 'scoop'
+        commitMessage: 'riot {{tagName}}'
+    artifacts:
+      - path: plugins/{{distributionName}}/build/distributions/{{distributionName}}-{{projectVersion}}.zip
+        transform: '{{distributionName}}/{{distributionName}}-{{projectEffectiveVersion}}.zip'
+        extraProperties:
+          skipSpec: 'true'
+      - path: plugins/{{distributionName}}/build/distributions/{{distributionName}}-{{projectVersion}}.tar
+        transform: '{{distributionName}}/{{distributionName}}-{{projectEffectiveVersion}}.tar'
+        extraProperties:
+          skipFlatpak: 'true'
+
+  riot-standalone:  
     brew:
       active: ALWAYS
       continueOnError: true
@@ -173,7 +191,7 @@ distributions:
       multiPlatform: true
       repository:
         active: RELEASE
-        commitMessage: 'riot {{tagName}}'  
+        commitMessage: 'riot {{tagName}}'
     docker:
       active: ALWAYS
       continueOnError: true
@@ -186,41 +204,13 @@ distributions:
       labels:
         'org.opencontainers.image.title': 'riot'
       imageNames:
-        - 'riotx/{{distributionName}}:{{tagName}}'
-        - 'riotx/{{distributionName}}:latest'
+        - 'riotx/riot:{{tagName}}'
+        - 'riotx/riot:latest'
       buildx:
         enabled: true
         platforms:
           - 'linux/amd64'
           - 'linux/arm64'
-    scoop:
-      active: ALWAYS
-      continueOnError: true
-      repository:
-        active: RELEASE
-        name: 'scoop'
-        commitMessage: 'riot {{tagName}}'
-    artifacts:
-      - path: plugins/{{distributionName}}/build/distributions/{{distributionName}}-{{projectVersion}}.zip
-        transform: '{{distributionName}}/{{distributionName}}-{{projectEffectiveVersion}}.zip'
-        extraProperties:
-          skipSpec: 'true'
-      - path: plugins/{{distributionName}}/build/distributions/{{distributionName}}-{{projectVersion}}.tar
-        transform: '{{distributionName}}/{{distributionName}}-{{projectEffectiveVersion}}.tar'
-        extraProperties:
-          skipFlatpak: 'true'
-
-  riot-standalone:
-    appImage:
-      active: NEVER
-      componentId: com.redis.riot
-      developerName: Redis
-      categories:
-        - Development
-      repository:
-        active: RELEASE
-        name: riot-appimage
-        commitMessage: 'riot {{tagName}}'
 
 files:
   artifacts: