diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
index 5b21d99..11859c0 100644
--- a/.github/workflows/ci-workflow.yml
+++ b/.github/workflows/ci-workflow.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       API_SPEC_DEV_BRANCH: support-2.x
-      API_SPEC_TAG: 
+      API_SPEC_TAG: v2.1-2.0.2
       APPID_TENANT: 0f389ea4-778e-4831-9b29-6156c4c1df1e
       APPID_URL: https://us-east.appid.cloud.ibm.com
       JWT_AUDIENCE_ID: 21e7d376-9cdb-4a9d-a11f-9b76c007244d
diff --git a/mgmt-api-manifest.yml b/mgmt-api-manifest.yml
index b0f1743..169a7ff 100644
--- a/mgmt-api-manifest.yml
+++ b/mgmt-api-manifest.yml
@@ -4,7 +4,7 @@
 
 packages:
     hri_mgmt_api:
-        version: 2.1.5
+        version: 2.1.6
         actions:
             create_batch:
                 function: build/batches_create-bin.zip
diff --git a/test/spec/hri_management_api_no_validation_spec.rb b/test/spec/hri_management_api_no_validation_spec.rb
index d6abd79..bb3f6e9 100644
--- a/test/spec/hri_management_api_no_validation_spec.rb
+++ b/test/spec/hri_management_api_no_validation_spec.rb
@@ -286,6 +286,7 @@
     it 'Success With Invalid Topic Only' do
       invalid_topic = "ingest.#{TENANT_ID}.#{TEST_INTEGRATOR_ID}.invalid"
       @event_streams_helper.create_topic(invalid_topic, 1)
+      
       response = @hri_helper.hri_get_tenant_streams(TENANT_ID)
       expect(response.code).to eq 200
       parsed_response = JSON.parse(response.body)
@@ -296,9 +297,6 @@
       raise "Tenant Stream Not Found: #{TEST_INTEGRATOR_ID}" unless stream_found
 
       Timeout.timeout(15, nil, "Timed out waiting for the '#{invalid_topic}' topic to be deleted") do
-        loop do
-          break if @event_streams_helper.get_topics.include?(invalid_topic)
-        end
         loop do
           @event_streams_helper.delete_topic(invalid_topic)
           break unless @event_streams_helper.get_topics.include?(invalid_topic)