diff --git a/incubating/octopusdeploy-run-runbook/run_a_runbook.svg b/incubating/octopusdeploy-run-runbook/run_a_runbook.svg
new file mode 100644
index 000000000..8e6a0b111
--- /dev/null
+++ b/incubating/octopusdeploy-run-runbook/run_a_runbook.svg
@@ -0,0 +1,14 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.51438 32.4512C9.91892 32.4512 11.7916 31.5148 13.1962 28.4717L13.8984 28.7058C12.4939 31.7489 10.3871 33.1535 8.51438 32.9194C6.64167 32.9194 5.00305 31.2807 4.30078 29.1739L5.23714 29.408C5.70532 31.2807 7.10985 32.4512 8.51438 32.4512Z" fill="#BBE4FC" stroke="#BBE4FC" stroke-width="0.468178" stroke-miterlimit="10"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1.01796 31.2818C1.01796 30.8136 3.82703 28.4727 4.76338 28.2386C5.23156 28.2386 5.76457 28.1792 5.53048 29.5838C5.53048 30.052 5.23156 30.1114 4.2952 30.5795C2.89067 31.2818 0.783868 32.6863 1.01796 31.2818Z" fill="#BBE4FC"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.2559 30.1108C28.1717 22.6199 35.4285 27.5358 34.4921 33.8562C34.9603 28.004 28.4058 24.0245 24.6604 30.813L23.2559 30.1108Z" fill="#1F2F3C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M28.1684 27.536C26.998 28.0042 25.8275 28.9406 24.6571 30.8133L23.7207 30.3451C25.1252 28.4724 26.2957 27.3019 27.7002 26.5997C29.1048 26.1315 30.5093 26.1315 31.6797 26.5997C34.0206 27.7701 35.1911 30.8133 34.7229 33.8564L34.0206 33.3883C34.4888 30.5792 32.8502 28.2383 31.2116 27.3019C30.5093 27.0678 29.3388 27.0678 28.1684 27.536Z" fill="#BBE4FC" stroke="#BBE4FC" stroke-width="0.468178" stroke-miterlimit="10"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M38.4722 31.2812C38.4722 31.7494 35.4291 34.5585 34.7268 34.7925C34.2586 35.0266 33.1676 35.1877 33.6358 33.7832C33.8004 33.2893 34.2586 32.6857 35.195 32.2176C36.3654 31.2812 38.4722 29.8767 38.4722 31.2812Z" fill="#BBE4FC"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M29.1075 21.4499L13.1895 27.068L16.4667 6.23409L17.169 6L30.7461 11.384L31.2143 11.6181H30.9802L29.1075 21.4499Z" fill="#142839"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.7695 7.4043V8.80883L21.1536 9.27701V8.80883L15.7695 7.4043Z" fill="#142839"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.704 30.1106L10.8496 27.0675L13.6587 8.57446C13.6587 8.57446 14.1269 8.10628 15.0632 7.6381L20.9154 9.04263L15.7655 7.40401C16.2337 7.16992 16.7018 7.16992 17.17 7.16992L30.5131 12.0858L27.704 30.1106Z" fill="#BBE4FC"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26.7674 28.4717C26.0651 29.174 25.831 31.2808 25.1288 31.0467C20.9152 30.5785 15.7652 28.9399 10.6152 28.2376L12.2539 8.34005L12.9561 8.10596C16.9356 8.57414 25.5969 11.1491 28.1719 11.8514L30.7469 11.3832L31.2151 11.6173C31.2151 11.6173 30.0446 12.3196 30.7469 12.5536L26.7674 28.4717Z" fill="#008BE3"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26.3 28.9402C25.5977 29.6424 24.8955 31.5152 24.8955 31.5152C18.8092 29.8765 11.7865 28.9402 9.67969 28.9402L12.4888 8.34033C16.9364 9.0426 25.5977 11.6176 28.1727 12.0858C28.875 12.3198 30.2795 11.6176 30.9818 11.8517L26.3 28.9402Z" fill="#0D80D8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.7053 30.3453L24.6621 31.5157L28.1734 12.0863L30.9825 11.6182L27.7053 30.3453Z" fill="#00A4FA"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M31.2164 11.384L30.28 11.6181L16.4688 6.23409L17.171 6L31.2164 11.384Z" fill="#008BE3"/>
+</svg>
diff --git a/incubating/octopusdeploy-run-runbook/step.yaml b/incubating/octopusdeploy-run-runbook/step.yaml
new file mode 100644
index 000000000..25b6a0513
--- /dev/null
+++ b/incubating/octopusdeploy-run-runbook/step.yaml
@@ -0,0 +1,179 @@
+version: "1.0"
+kind: step-type
+metadata:
+  name: octopusdeploy-run-runbook
+  version: 1.0.0
+  title: Run a runbook in Octopus Deploy
+  isPublic: true
+  description: Run a runbook in Octopus Deploy
+  sources:
+    - "https://github.com/codefresh-io/steps/tree/master/incubating/octopusdeploy-run-runbook"
+  stage: incubating
+  official: true
+  categories:
+    - deployment
+  icon:
+    type: svg
+    url: "https://cdn.jsdelivr.net/gh/codefresh-io/steps/incubating/octopusdeploy-run-runbook/run_a_runbook.svg"
+    background: "#F4F6F8"
+  maintainers:
+    - name: OctopusDeploy
+  examples:
+    - description: Basic usage of the run a runbook step
+      workflow:
+        run-runbook:
+          type: octopusdeploy-run-runbook
+          arguments:
+            OCTOPUS_API_KEY: "${{OCTOPUS_API_KEY}}"
+            OCTOPUS_URL: "${{OCTOPUS_URL}}"
+            OCTOPUS_SPACE: "Spaces 1"
+            PROJECT: "Project Name"
+            NAME: "Runbook Name"
+            ENVIRONMENTS:
+              - "Development"
+              - "Production"
+    - description: Complex usage of the run a runbook step
+      workflow:
+        run-runbook:
+          type: octopusdeploy-run-runbook
+          arguments:
+            OCTOPUS_API_KEY: "${{OCTOPUS_API_KEY}}"
+            OCTOPUS_URL: "${{OCTOPUS_URL}}"
+            OCTOPUS_SPACE: "Spaces 1"
+            PROJECT: "Project Name"
+            NAME: "Runbook Name"
+            ENVIRONMENTS:
+              - "Development"
+              - "Production"
+            VARIABLES:
+              - "Label:Value"
+            TENANTS:
+              - "Tenant 1"
+            TENANT_TAGS:
+              - "Tenant tag 1"
+            USE_GUIDED_FAILURE: "false"
+spec:
+  arguments: |-
+    {
+      "definitions": {},
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "type": "object",
+      "name": "octopusdeploy-run-runbook",
+      "additionalProperties": false,
+      "patterns": [],
+      "required": ["OCTOPUS_API_KEY", "OCTOPUS_URL", "OCTOPUS_SPACE", "PROJECT", "NAME", "ENVIRONMENTS"],
+      "properties": {
+        "OCTOPUS_API_KEY": {
+          "type": "string",
+          "description": "API key for octopus deploy (required)"
+        },
+        "OCTOPUS_URL": {
+          "type": "string",
+          "description": "URL of the octopus deploy server (required)"
+        },
+        "OCTOPUS_SPACE": {
+          "type": "string",
+          "description": "API key for octopus deploy (required)"  
+        },
+        "PROJECT": {
+          "type": "string",
+          "description": "The name of the project associated with this release (required)"
+        },
+        "NAME": {
+          "type": "string",
+          "description": "Name of the runbook to run (required)"
+        },
+        "ENVIRONMENTS": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "The environment names to run in (required)"
+        },
+        "VARIABLES": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "Set the value for a prompted variable in the format Label:Value (optional)"
+        },
+        "TENANTS": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "Run for these tenants (optional)"
+        },
+        "TENANT_TAGS": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "Run for tenants matching these tags (optional)"
+        },
+        "USE_GUIDED_FAILURE": {
+          "type": "string",
+          "description": "Enable Guided failure mode (true/false/default) (optional)"
+        }
+      }
+    }
+  returns: |-
+    {
+      "definitions": {},
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "type": "object",
+      "additionalProperties": true,
+      "patterns": [],
+      "required": [
+        "RUNBOOK_RUNS"
+      ],
+      "properties": {
+        "RUNBOOK_RUNS": {
+          "type": "array",
+          "description": "The list of runbook runs",
+          "items": {
+            "type": "object",
+            "additionalProperties": true,
+            "patterns": [],
+            "required": [
+              "RunbookRunId",
+              "ServerTaskId"
+            ],
+            "properties": {
+              "RunbookRunId": {
+                "type": "string",
+                "description": "The runbook run Id"
+              },
+              "ServerTaskId": {
+                "type": "string",
+                "description": "The server task Id"
+              }
+            }
+          }
+        }
+      }
+    }
+  stepsTemplate: |-
+    run-runbook:
+      name: octopusdeploy-run-runbook
+      image: octopuslabs/octopus-cli
+      tag: latest
+      commands:
+        - OUTPUT=$(octopus runbook run 
+          --project "[[.Arguments.PROJECT]]" 
+          --name "[[.Arguments.NAME]]"
+          [[- range $val := .Arguments.ENVIRONMENTS ]] --environment "[[ $val ]]" [[ end ]]
+          [[- range $val := .Arguments.VARIABLES ]] --variable "[[ $val ]]" [[ end ]]
+          [[- range $val := .Arguments.TENANTS ]] --tenant "[[ $val ]]" [[ end ]]
+          [[- range $val := .Arguments.TENANT_TAGS ]] --tenant-tag "[[ $val ]]" [[ end ]]
+          [[- if .Arguments.USE_GUIDED_FAILURE ]] --guided-failure "[[ .Arguments.USE_GUIDED_FAILURE ]]" [[ end ]]
+          --output-format json
+          --no-prompt)
+        - cf_export RUNBOOK_RUNS=$OUTPUT
+      environment:
+        - 'OCTOPUS_URL=[[.Arguments.OCTOPUS_URL]]'
+        - 'OCTOPUS_API_KEY=[[.Arguments.OCTOPUS_API_KEY]]'
+        - 'OCTOPUS_SPACE=[[.Arguments.OCTOPUS_SPACE]]'
+  delimiters:
+    left: "[["
+    right: "]]"