diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml
new file mode 100644
index 0000000..126f959
--- /dev/null
+++ b/.github/workflows/rebase.yml
@@ -0,0 +1,21 @@
+name: Rebase Upstream
+on:
+  schedule:
+  - cron: "0 0 * * 0"  # run once a week
+  workflow_dispatch:   # run manually
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+      with:
+        fetch-depth: 0 # fetching all history so i can rebase
+        token: ${{ secrets.GH_TOKEN }}
+    - name: Configure git for tradeshiftci
+      uses: tradeshift/actions-git/configure-from-gpg-key@v1
+      with:
+        gpg-key: ${{ secrets.TRADESHIFTCI_GPG_KEY }}  
+    - uses: tradeshift/rebase-upstream-action@master
+      with:
+        branch: main
diff --git a/.github/workflows/test-command.yml b/.github/workflows/test-command.yml
index f5cd260..4503716 100644
--- a/.github/workflows/test-command.yml
+++ b/.github/workflows/test-command.yml
@@ -64,7 +64,7 @@ jobs:
       # Test create from template
       - name: Render template
         id: template
-        uses: chuhlomin/render-template@v1.6
+        uses: chuhlomin/render-template@v1.7
         with:
           template: .github/comment-template.md
           vars: |
diff --git a/.github/workflows/test-v3.yml b/.github/workflows/test-v3.yml
index 77770c2..ad49bea 100644
--- a/.github/workflows/test-v3.yml
+++ b/.github/workflows/test-v3.yml
@@ -51,7 +51,7 @@ jobs:
       # Test create from template
       - name: Render template
         id: template
-        uses: chuhlomin/render-template@v1.6
+        uses: chuhlomin/render-template@v1.7
         with:
           template: .github/comment-template.md
           vars: |
diff --git a/catalog-info.yml b/catalog-info.yml
new file mode 100644
index 0000000..be27606
--- /dev/null
+++ b/catalog-info.yml
@@ -0,0 +1,16 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: actions-create-or-update-comment
+  description: |
+    A GitHub action to create or update an issue or pull request comment
+  annotations:
+    github.com/project-slug: Tradeshift/actions-create-or-update-comment
+  tags:
+    - github-action
+    - nodejs
+    - fork
+spec:
+  type: library
+  owner: sre
+  lifecycle: production