diff --git a/.drone.jsonnet b/.drone.jsonnet
index 51b5d75..7c580f8 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -31,7 +31,7 @@ local PipelineBuild(arch='amd64') = {
       settings: {
         dry_run: true,
         dockerfile: './Dockerfile.' + arch,
-        repo: 'xoxys/freshrss',
+        repo: 'xoxys/bitwardenrs',
         username: { from_secret: 'docker_username' },
         password: { from_secret: 'docker_password' },
       },
@@ -43,7 +43,7 @@ local PipelineBuild(arch='amd64') = {
         auto_tag: true,
         auto_tag_suffix: arch,
         dockerfile: './Dockerfile.' + arch,
-        repo: 'xoxys/freshrss',
+        repo: 'xoxys/bitwardenrs',
         username: { from_secret: 'docker_username' },
         password: { from_secret: 'docker_password' },
       },
@@ -103,9 +103,9 @@ local PipelineNotifications(depends_on=[]) = {
         DOCKERHUB_USERNAME: { from_secret: 'docker_username' },
         DOCKERHUB_PASSWORD: { from_secret: 'docker_password' },
         DOCKERHUB_REPO_PREFIX: 'xoxys',
-        DOCKERHUB_REPO_NAME: 'freshrss',
+        DOCKERHUB_REPO_NAME: 'bitwardenrs',
         README_PATH: 'README.md',
-        SHORT_DESCRIPTION: 'Rootless FreshRSS - Self-hosted RSS feed aggregator',
+        SHORT_DESCRIPTION: 'Rootless bitwardenrs - Self-hosted RSS feed aggregator',
       },
       when: {
         ref: [
diff --git a/.drone.yml b/.drone.yml
index ae7c9d3..9658184 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -29,7 +29,7 @@ steps:
     dry_run: true
     password:
       from_secret: docker_password
-    repo: xoxys/freshrss
+    repo: xoxys/bitwardenrs
     username:
       from_secret: docker_username
 
@@ -41,7 +41,7 @@ steps:
     dockerfile: ./Dockerfile.amd64
     password:
       from_secret: docker_password
-    repo: xoxys/freshrss
+    repo: xoxys/bitwardenrs
     username:
       from_secret: docker_username
   when:
@@ -95,12 +95,12 @@ steps:
   environment:
     DOCKERHUB_PASSWORD:
       from_secret: docker_password
-    DOCKERHUB_REPO_NAME: freshrss
+    DOCKERHUB_REPO_NAME: bitwardenrs
     DOCKERHUB_REPO_PREFIX: xoxys
     DOCKERHUB_USERNAME:
       from_secret: docker_username
     README_PATH: README.md
-    SHORT_DESCRIPTION: Rootless FreshRSS - Self-hosted RSS feed aggregator
+    SHORT_DESCRIPTION: Rootless bitwardenrs - Self-hosted RSS feed aggregator
   when:
     ref:
     - refs/heads/master
diff --git a/manifest.tmpl b/manifest.tmpl
index a054d6b..225cc27 100644
--- a/manifest.tmpl
+++ b/manifest.tmpl
@@ -4,12 +4,12 @@ tags:
 {{#each build.tags}}
   {{#if this}}
   - {{trimPrefix "v" this}}
-  - {{trimPrefix "v" this}}-linux-amd64
+  - {{trimPrefix "v" this}}-amd64
   {{/if}}
 {{/each}}
 {{/if}}
 manifests:
-  - image: xoxys/bitwardenrs:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64
+  - image: xoxys/bitwardenrs:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}amd64
     platform:
       architecture: amd64
       os: linux