diff --git a/k8s-custom-pipelines.yml b/k8s-custom-pipelines.yml
new file mode 100644
index 00000000000..a3304668086
--- /dev/null
+++ b/k8s-custom-pipelines.yml
@@ -0,0 +1,339 @@
+resources:
+  repositories:
+  - repository: K8sPartnerExtensionTest
+    type: git
+    endpoint: AzureReposConnection
+    name: One/compute-HybridMgmt-K8sPartnerExtensionTest
+
+trigger:
+  batch: true
+  branches:
+    include:
+      - k8s-extension/public
+      - k8s-extension/private
+pr:
+  branches:
+    include:
+      - k8s-extension/public
+      - k8s-extension/private
+
+stages:
+- stage: BuildTestPublishExtension
+  displayName: "Build, Test, and Publish Extension"
+  variables:
+    K8S_EXTENSION_REPO_PATH: $(Agent.BuildDirectory)/s/compute-HybridMgmt-K8sPartnerExtensionTest
+    CLI_REPO_PATH: $(Agent.BuildDirectory)/s/azure-cli-extensions
+    SUBSCRIPTION_ID: "15c06b1b-01d6-407b-bb21-740b8617dea3"
+    RESOURCE_GROUP: "K8sPartnerExtensionTest"
+    BASE_CLUSTER_NAME: "k8s-extension-cluster"
+    IS_PRIVATE_BRANCH: $[or(eq(variables['Build.SourceBranch'], 'refs/heads/k8s-extension/private'), eq(variables['System.PullRequest.TargetBranch'], 'k8s-extension/private'))]
+
+    EXTENSION_NAME: "k8s-extension"
+    EXTENSION_FILE_NAME: "k8s_extension"
+  jobs:
+  - job: K8sExtensionTestSuite
+    displayName: "Run the Test Suite"
+    pool:
+      vmImage: 'ubuntu-16.04'
+    steps:
+      - checkout: self
+      - checkout: K8sPartnerExtensionTest
+      - bash: |
+          echo "Installing helm3"
+          curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3
+          chmod 700 get_helm.sh
+          ./get_helm.sh
+
+          echo "Installing kubectl"
+          curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl"
+          chmod +x ./kubectl
+          sudo mv ./kubectl /usr/local/bin/kubectl
+          kubectl version --client
+        displayName: "Setup the VM with helm3 and kubectl" 
+      - task: UsePythonVersion@0
+        displayName: 'Use Python 3.6'
+        inputs:
+          versionSpec: 3.6
+      - bash: |
+          set -ev
+          echo "Building extension ${EXTENSION_NAME}..."
+
+          # prepare and activate virtualenv
+          pip install virtualenv
+          python3 -m venv env/
+          source env/bin/activate
+
+          # clone azure-cli
+          pip install azdev
+
+          ls $(CLI_REPO_PATH)
+
+          azdev --version
+          azdev setup -r $(CLI_REPO_PATH) -e $(EXTENSION_NAME)
+          azdev extension build $(EXTENSION_NAME)
+
+        workingDirectory: $(CLI_REPO_PATH)
+        displayName: "Setup and Build Extension with azdev"
+      
+      - bash: |
+          K8S_EXTENSION_VERSION=$(ls ${EXTENSION_FILE_NAME}* | cut -d "-" -f2)
+          echo "##vso[task.setvariable variable=K8S_EXTENSION_VERSION]$K8S_EXTENSION_VERSION"
+          cp * $(K8S_EXTENSION_REPO_PATH)/bin
+        workingDirectory: $(CLI_REPO_PATH)/dist
+        displayName: "Copy the Built .whl to Extension Test Path"
+
+      - bash: |
+          RAND_STR=$RANDOM
+          AKS_CLUSTER_NAME="${BASE_CLUSTER_NAME}-${RAND_STR}-aks"
+          ARC_CLUSTER_NAME="${BASE_CLUSTER_NAME}-${RAND_STR}-arc"
+
+          JSON_STRING=$(jq -n \
+                          --arg SUB_ID "$SUBSCRIPTION_ID" \
+                          --arg RG "$RESOURCE_GROUP" \
+                          --arg AKS_CLUSTER_NAME "$AKS_CLUSTER_NAME" \
+                          --arg ARC_CLUSTER_NAME "$ARC_CLUSTER_NAME" \
+                          --arg K8S_EXTENSION_VERSION "$K8S_EXTENSION_VERSION" \
+                          '{subscriptionId: $SUB_ID, resourceGroup: $RG, aksClusterName: $AKS_CLUSTER_NAME, arcClusterName: $ARC_CLUSTER_NAME, extensionVersion: {"k8s-extension": $K8S_EXTENSION_VERSION, connectedk8s: "1.0.0"}}')
+          echo $JSON_STRING > settings.json
+          cat settings.json
+        workingDirectory: $(K8S_EXTENSION_REPO_PATH)
+        displayName: "Generate a settings.json file"
+
+      - bash : |
+          echo "Downloading the kind script"
+          curl -Lo ./kind https://kind.sigs.k8s.io/dl/v0.9.0/kind-linux-amd64
+          chmod +x ./kind
+          ./kind create cluster
+        displayName: "Create and Start the Kind cluster"
+
+      - task: AzureCLI@2
+        displayName: Bootstrap
+        inputs:
+          azureSubscription: AzureResourceConnection
+          scriptType: pscore
+          scriptLocation: inlineScript
+          inlineScript: |
+            .\Bootstrap.ps1 -CI
+          workingDirectory: $(K8S_EXTENSION_REPO_PATH)
+      
+      - task: AzureCLI@2
+        displayName: Run the Test Suite Public Extensions Only
+        inputs:
+          azureSubscription: AzureResourceConnection
+          scriptType: pscore
+          scriptLocation: inlineScript
+          inlineScript: |
+            .\Test.ps1 -CI -ExtensionType Public -OnlyPublicTests
+          workingDirectory: $(K8S_EXTENSION_REPO_PATH)
+        continueOnError: true
+        condition: and(succeeded(), eq(variables['IS_PRIVATE_BRANCH'], 'False'))
+      
+      - task: AzureCLI@2
+        displayName: Run the Test Suite on Private + Public Extensions
+        inputs:
+          azureSubscription: AzureResourceConnection
+          scriptType: pscore
+          scriptLocation: inlineScript
+          inlineScript: |
+            .\Test.ps1 -CI -ExtensionType Public
+          workingDirectory: $(K8S_EXTENSION_REPO_PATH)
+        continueOnError: true
+        condition: and(succeeded(), eq(variables['IS_PRIVATE_BRANCH'], 'True'))
+
+      - task: PublishTestResults@2
+        inputs:
+          testResultsFormat: 'JUnit'
+          testResultsFiles: '**/TestResults.xml'
+          failTaskOnFailedTests: true
+        condition: succeededOrFailed()
+
+      - task: AzureCLI@2
+        displayName: Cleanup
+        inputs:
+          azureSubscription: AzureResourceConnection
+          scriptType: pscore
+          scriptLocation: inlineScript
+          inlineScript: |
+            .\Cleanup.ps1 -CI
+          workingDirectory: $(K8S_EXTENSION_REPO_PATH)
+        condition: succeededOrFailed()
+
+  - job: BuildPublishExtension
+    pool:
+      vmImage: 'ubuntu-16.04'
+    displayName: "Build and Publish the Extension Artifact"
+    variables: 
+      CLI_REPO_PATH: $(Agent.BuildDirectory)/s
+    steps:
+    - bash: |
+        echo "Using the private preview of k8s-extension to build..."
+
+        cp $(CLI_REPO_PATH)/src/k8s-extension $(CLI_REPO_PATH)/src/k8s-extension-private -r
+        cp $(CLI_REPO_PATH)/src/k8s-extension-private/azext_k8s_extension/_consts_private.py $(CLI_REPO_PATH)/src/k8s-extension-private/azext_k8s_extension/_consts.py
+
+        EXTENSION_NAME="k8s-extension-private"
+        EXTENSION_FILE_NAME="k8s_extension_private"
+
+        echo "##vso[task.setvariable variable=EXTENSION_NAME]$EXTENSION_NAME"
+        echo "##vso[task.setvariable variable=EXTENSION_FILE_NAME]$EXTENSION_FILE_NAME"
+      condition: and(succeeded(), eq(variables['IS_PRIVATE_BRANCH'], 'True'))
+      displayName: "Copy Files, Set Variables for k8s-extension-private"
+    - bash: |
+        echo "Using the public version of k8s-extension to build..."
+
+        EXTENSION_NAME="k8s-extension"
+        EXTENSION_FILE_NAME="k8s_extension"
+
+        echo "##vso[task.setvariable variable=EXTENSION_NAME]$EXTENSION_NAME"
+        echo "##vso[task.setvariable variable=EXTENSION_FILE_NAME]$EXTENSION_FILE_NAME"
+      condition: and(succeeded(), eq(variables['IS_PRIVATE_BRANCH'], 'False'))
+      displayName: "Copy Files, Set Variables for k8s-extension"
+    - task: UsePythonVersion@0
+      displayName: 'Use Python 3.6'
+      inputs:
+        versionSpec: 3.6
+    - bash: |
+        set -ev
+        echo "Building extension ${EXTENSION_NAME}..."
+
+        # prepare and activate virtualenv
+        pip install virtualenv
+        python3 -m venv env/
+        source env/bin/activate
+
+        # clone azure-cli
+        pip install azdev
+
+        ls $(CLI_REPO_PATH)
+
+        azdev --version
+        azdev setup -r $(CLI_REPO_PATH) -e $(EXTENSION_NAME)
+        azdev extension build $(EXTENSION_NAME)
+      workingDirectory: $(CLI_REPO_PATH)
+      displayName: "Setup and Build Extension with azdev"
+    - task: PublishBuildArtifacts@1
+      inputs: 
+        pathToPublish: $(CLI_REPO_PATH)/dist
+      
+- stage: AzureCLIOfficial
+  displayName: "Azure Official CLI Code Checks"
+  dependsOn: []
+  jobs:
+  - job: CheckLicenseHeader
+    displayName: "Check License"
+    pool:
+      vmImage: 'ubuntu-16.04'
+    steps:
+    - task: UsePythonVersion@0
+      displayName: 'Use Python 3.6'
+      inputs:
+        versionSpec: 3.6
+    - bash: |
+        set -ev
+
+        # prepare and activate virtualenv
+        python -m venv env/
+
+        chmod +x ./env/bin/activate
+        source ./env/bin/activate
+
+        # clone azure-cli
+        git clone -q --single-branch -b dev https://github.com/Azure/azure-cli.git ../azure-cli
+
+        pip install -q azdev
+
+        azdev setup -c ../azure-cli -r ./
+
+        azdev --version
+        az --version
+
+        azdev verify license
+
+  - job: StaticAnalysis
+    displayName: "Static Analysis"
+    pool:
+      vmImage: 'ubuntu-16.04'
+    steps:
+      - task: UsePythonVersion@0
+        displayName: 'Use Python 3.6'
+        inputs:
+          versionSpec: 3.6
+      - bash: pip install wheel==0.30.0 pylint==1.9.5 flake8==3.5.0 requests
+        displayName: 'Install wheel, pylint, flake8, requests'
+      - bash: python scripts/ci/source_code_static_analysis.py
+        displayName: "Static Analysis"
+
+  - job: IndexVerify
+    displayName: "Verify Extensions Index"
+    pool:
+      vmImage: 'ubuntu-16.04'
+    steps:
+    - task: UsePythonVersion@0
+      displayName: 'Use Python 3.7'
+      inputs:
+        versionSpec: 3.7
+    - bash: |
+        #!/usr/bin/env bash
+        set -ev
+        pip install wheel==0.30.0 requests packaging
+        export CI="ADO"
+        python ./scripts/ci/test_index.py -v
+      displayName: "Verify Extensions Index"
+
+  - job: SourceTests
+    displayName: "Integration Tests, Build Tests"
+    pool:
+      vmImage: 'ubuntu-16.04'
+    strategy:
+      matrix:
+        Python36:
+          python.version: '3.6'
+        Python38:
+          python.version: '3.8'
+    steps:
+      - task: UsePythonVersion@0
+        displayName: 'Use Python $(python.version)'
+        inputs:
+          versionSpec: '$(python.version)'
+      - bash: pip install wheel==0.30.0
+        displayName: 'Install wheel==0.30.0'
+      - bash: ./scripts/ci/test_source.sh
+        displayName: 'Run integration test and build test'
+        env:
+          ADO_PULL_REQUEST_LATEST_COMMIT: $(System.PullRequest.SourceCommitId)
+          ADO_PULL_REQUEST_TARGET_BRANCH: $(System.PullRequest.TargetBranch)
+
+  - job: LintModifiedExtensions
+    displayName: "CLI Linter on Modified Extensions"
+    pool:
+      vmImage: 'ubuntu-16.04'
+    steps:
+      - task: UsePythonVersion@0
+        displayName: 'Use Python 3.6'
+        inputs:
+          versionSpec: 3.6
+      - bash: |
+          set -ev
+
+          # prepare and activate virtualenv
+          pip install virtualenv
+          python -m virtualenv venv/
+          source ./venv/bin/activate
+
+          # clone azure-cli
+          git clone --single-branch -b dev https://github.com/Azure/azure-cli.git ../azure-cli
+
+          pip install azdev
+
+          azdev --version
+
+          azdev setup -c ../azure-cli -r ./ -e k8s-extension
+
+          # overwrite the default AZURE_EXTENSION_DIR set by ADO
+          AZURE_EXTENSION_DIR=~/.azure/cliextensions az --version
+
+          AZURE_EXTENSION_DIR=~/.azure/cliextensions azdev linter --include-whl-extensions k8s-extension
+        displayName: "CLI Linter on Modified Extension"
+        env:
+          ADO_PULL_REQUEST_LATEST_COMMIT: $(System.PullRequest.SourceCommitId)
+          ADO_PULL_REQUEST_TARGET_BRANCH: $(System.PullRequest.TargetBranch)
diff --git a/src/k8s-extension/HISTORY.rst b/src/k8s-extension/HISTORY.rst
index 54c1e375f6f..d20160a2199 100644
--- a/src/k8s-extension/HISTORY.rst
+++ b/src/k8s-extension/HISTORY.rst
@@ -3,6 +3,12 @@
 Release History
 ===============
 
+0.2.1
+++++++++++++++++++
+
+* Remove `k8s-extension update` until PATCH is supported
+* Improved logging for overwriting extension name with default 
+
 0.2.0
 ++++++++++++++++++
 
diff --git a/src/k8s-extension/azext_k8s_extension/_consts.py b/src/k8s-extension/azext_k8s_extension/_consts.py
index d0fdaf7775f..144e9450012 100644
--- a/src/k8s-extension/azext_k8s_extension/_consts.py
+++ b/src/k8s-extension/azext_k8s_extension/_consts.py
@@ -5,4 +5,4 @@
 # --------------------------------------------------------------------------------------------
 
 EXTENSION_NAME = 'k8s-extension'
-VERSION = "0.2.0"
+VERSION = "0.2.1"
diff --git a/src/k8s-extension/azext_k8s_extension/_help.py b/src/k8s-extension/azext_k8s_extension/_help.py
index 64e4be612ea..562f0af58aa 100644
--- a/src/k8s-extension/azext_k8s_extension/_help.py
+++ b/src/k8s-extension/azext_k8s_extension/_help.py
@@ -32,8 +32,3 @@
     type: command
     short-summary: Show details of a K8s-extension.
 """
-
-helps[f'{consts.EXTENSION_NAME} update'] = """
-    type: command
-    short-summary: Update a K8s-extension.
-"""
diff --git a/src/k8s-extension/azext_k8s_extension/commands.py b/src/k8s-extension/azext_k8s_extension/commands.py
index 931662814c0..3a823177d1c 100644
--- a/src/k8s-extension/azext_k8s_extension/commands.py
+++ b/src/k8s-extension/azext_k8s_extension/commands.py
@@ -20,7 +20,6 @@ def load_command_table(self, _):
                             is_preview=True) \
             as g:
         g.custom_command('create', 'create_k8s_extension')
-        g.custom_command('update', 'update_k8s_extension')
         g.custom_command('delete', 'delete_k8s_extension', confirmation=True)
         g.custom_command('list', 'list_k8s_extension', table_transformer=k8s_extension_list_table_format)
         g.custom_show_command('show', 'show_k8s_extension', table_transformer=k8s_extension_show_table_format)
diff --git a/src/k8s-extension/azext_k8s_extension/partner_extensions/AzureDefender.py b/src/k8s-extension/azext_k8s_extension/partner_extensions/AzureDefender.py
index dcd2853affc..3124faec4c1 100644
--- a/src/k8s-extension/azext_k8s_extension/partner_extensions/AzureDefender.py
+++ b/src/k8s-extension/azext_k8s_extension/partner_extensions/AzureDefender.py
@@ -41,7 +41,8 @@ def Create(self, cmd, client, resource_group_name, cluster_name, name, cluster_t
         is_ci_extension_type = False
 
         logger.warning('Ignoring name, release-namespace and scope parameters since %s '
-                       'only supports cluster scope and single instance of this extension', extension_type)
+                       'only supports cluster scope and single instance of this extension.', extension_type)
+        logger.warning("Defaulting to extension name '%s' and release-namespace '%s'", name, release_namespace)
 
         _get_container_insights_settings(cmd, resource_group_name, cluster_name, configuration_settings,
                                          configuration_protected_settings, is_ci_extension_type)
diff --git a/src/k8s-extension/azext_k8s_extension/partner_extensions/ContainerInsights.py b/src/k8s-extension/azext_k8s_extension/partner_extensions/ContainerInsights.py
index 8c678b34915..eade4256205 100644
--- a/src/k8s-extension/azext_k8s_extension/partner_extensions/ContainerInsights.py
+++ b/src/k8s-extension/azext_k8s_extension/partner_extensions/ContainerInsights.py
@@ -53,7 +53,8 @@ def Create(self, cmd, client, resource_group_name, cluster_name, name, cluster_t
         is_ci_extension_type = True
 
         logger.warning('Ignoring name, release-namespace and scope parameters since %s '
-                       'only supports cluster scope and single instance of this extension', extension_type)
+                       'only supports cluster scope and single instance of this extension.', extension_type)
+        logger.warning("Defaulting to extension name '%s' and release-namespace '%s'", name, release_namespace)
 
         _get_container_insights_settings(cmd, resource_group_name, cluster_name, configuration_settings,
                                          configuration_protected_settings, is_ci_extension_type)