diff --git a/argo-workflows.yaml b/argo-workflows.yaml
index b646a854680..3dd147ee27d 100644
--- a/argo-workflows.yaml
+++ b/argo-workflows.yaml
@@ -1,7 +1,7 @@
 package:
   name: argo-workflows
   version: 3.4.8
-  epoch: 1
+  epoch: 2
   description: Workflow engine for Kubernetes.
   copyright:
     - license: Apache-2.0
@@ -40,8 +40,7 @@ pipeline:
       make dist/argoexec
 
       mkdir -p ${{targets.destdir}}/usr/bin
-      mv dist/argo* ${{targets.destdir}}/usr/bin/
-      mv dist/workflow-controller* ${{targets.destdir}}/usr/bin/
+      mv dist/argo ${{targets.destdir}}/usr/bin/
 
   - uses: strip
 
@@ -52,6 +51,54 @@ subpackages:
       - runs: |
           mkdir -p ${{targets.subpkgdir}}/etc/ssh
           cp hack/ssh_known_hosts ${{targets.subpkgdir}}/etc/ssh/
+      - uses: strip
+
+  - name: "argo-workflow-controller"
+    description: "Argo workflow controller"
+    pipeline:
+      - runs: |
+          mkdir -p ${{targets.subpkgdir}}/usr/bin/
+          mv dist/workflow-controller ${{targets.subpkgdir}}/usr/bin/
+      - uses: strip
+
+  - name: "argo-workflow-executor"
+    description: "Argo workflow executor"
+    pipeline:
+      - runs: |
+          mkdir -p ${{targets.subpkgdir}}/usr/bin/
+          mv dist/argoexec ${{targets.subpkgdir}}/usr/bin/
+      - uses: strip
+
+  - name: argo-workflow-controller-compat
+    pipeline:
+      - runs: |
+          # Symlink the binary from usr/bin to /
+          mkdir -p "${{targets.subpkgdir}}"
+          ln -sf /usr/bin/workflow-controller ${{targets.subpkgdir}}/workflow-controller
+    dependencies:
+      runtime:
+        - argo-workflow-controller
+
+  - name: argo-workflow-executor-compat
+    pipeline:
+      - runs: |
+          # Symlink the binary from usr/bin to /
+          mkdir -p "${{targets.subpkgdir}}"
+          ln -sf /usr/bin/argoexec ${{targets.subpkgdir}}/argoexec
+    dependencies:
+      runtime:
+        - argo-workflow-executor
+
+  - name: argo-workflow-cli
+    pipeline:
+      - runs: |
+          # Symlink the binary from usr/bin to /
+          # Argocli serves the server https://github.com/argoproj/argo-workflows/blob/master/Dockerfile#L110
+          mkdir -p "${{targets.subpkgdir}}"
+          ln -sf /usr/bin/argo ${{targets.subpkgdir}}/argo
+    dependencies:
+      runtime:
+        - argo-workflows
 
 update:
   enabled: true