diff --git a/import-export-cli/docs/apictl_add_api.md b/import-export-cli/docs/apictl_add_api.md
index d9bd5a1ee..db3c31f50 100644
--- a/import-export-cli/docs/apictl_add_api.md
+++ b/import-export-cli/docs/apictl_add_api.md
@@ -21,6 +21,7 @@ apictl add/update api -n petstore --from-file=./Swagger.json --replicas=3 --name
 ### Options
 
 ```
+  -a, --apiEndPoint string      
   -f, --from-file stringArray   Path to swagger file
   -h, --help                    help for api
   -m, --mode string             Property to override the deploying mode. Available modes: privateJet, sidecar
diff --git a/import-export-cli/docs/apictl_set.md b/import-export-cli/docs/apictl_set.md
index 1995d1478..99d3978d6 100644
--- a/import-export-cli/docs/apictl_set.md
+++ b/import-export-cli/docs/apictl_set.md
@@ -28,7 +28,7 @@ apictl set --mode default
 ### Options
 
 ```
-      --export-directory string    Path to directory where APIs should be saved (default "/Users/chaminduwso2/.wso2apictl/exported")
+      --export-directory string    Path to directory where APIs should be saved (default "/home/naduni/.wso2apictl/exported")
   -h, --help                       help for set
       --http-request-timeout int   Timeout for HTTP Client (default 10000)
   -m, --mode string                If mode is set to "k8s", apictl is capable of executing Kubectl commands. For example "apictl get pods" -> "kubectl get pods". To go back to the default mode, set the mode to "default" (default "default")
diff --git a/import-export-cli/go.sum b/import-export-cli/go.sum
index 0d46e355e..1db1272a9 100644
--- a/import-export-cli/go.sum
+++ b/import-export-cli/go.sum
@@ -314,6 +314,7 @@ github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa
 github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ=
 github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
 github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
+github.com/openshift/api v3.9.0+incompatible/go.mod h1:dh9o4Fs58gpFXGSYfnVxGR9PnV53I8TW84pQaJDdGiY=
 github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
 github.com/operator-framework/operator-sdk v0.7.1-0.20190503181110-6aac3b6efddd/go.mod h1:iVyukRkam5JZa8AnjYf+/G3rk7JI1+M6GsU0sq0B9NA=
 github.com/pborman/uuid v0.0.0-20170612153648-e790cca94e6c/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34=
@@ -409,6 +410,8 @@ github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV
 github.com/wso2/k8s-api-operator v1.0.1 h1:na2r7LoyLDj+lO8558Aq+9fqG6LykhwttAmQWB+gS3k=
 github.com/wso2/k8s-api-operator/api-operator v0.0.0-20200401060926-f007c2f3cfb3 h1:7pwJIGWTqvJRgbGzqy+DalE2qmWrSeSAGEqH3N75yUI=
 github.com/wso2/k8s-api-operator/api-operator v0.0.0-20200401060926-f007c2f3cfb3/go.mod h1:yOoFabyChZn8ueA5QZt0XqVUox41XfmPt8tCJ060+cc=
+github.com/wso2/k8s-api-operator/api-operator v0.0.0-20200624054120-bbad656881c2 h1:i+wa7IOE0TL3bwOeJnjCH4CShS6CdZI+/xJlxFqfYKU=
+github.com/wso2/k8s-api-operator/api-operator v0.0.0-20200624054120-bbad656881c2/go.mod h1:Ta2JJAX8yucKOfHWPcNJdwzhxz2f546ldNfrfcef62g=
 github.com/wso2/k8s-apim-operator v0.0.0-20190906090738-fc77c27673ce h1:ADEoGtxq7K/7loRxqF9EchoMIoZFL8kUt7nJ7z1Gwvs=
 github.com/wso2/k8s-apim-operator v0.0.0-20190906090738-fc77c27673ce/go.mod h1:bzltphF0ElBW6n+4Ti6AHxKezZdv9yUslZtdZKq4dSA=
 github.com/wso2/k8s-apim-operator v1.0.0-beta h1:k950oMxmsoN9VIJrsDQ59vpsOVQeLLiqkKuGyo7lB+o=
diff --git a/import-export-cli/shell-completions/apictl_bash_completions.sh b/import-export-cli/shell-completions/apictl_bash_completions.sh
index 13bb111d1..9dce05d0a 100644
--- a/import-export-cli/shell-completions/apictl_bash_completions.sh
+++ b/import-export-cli/shell-completions/apictl_bash_completions.sh
@@ -257,6 +257,9 @@ _apictl_add_api()
     flags_with_completion=()
     flags_completion=()
 
+    flags+=("--apiEndPoint=")
+    two_word_flags+=("-a")
+    local_nonpersistent_flags+=("--apiEndPoint=")
     flags+=("--from-file=")
     two_word_flags+=("-f")
     local_nonpersistent_flags+=("--from-file=")
diff --git a/import-export-cli/shell-completions/apictl_zsh_completions.sh b/import-export-cli/shell-completions/apictl_zsh_completions.sh
index fec243d38..a4befa01d 100644
--- a/import-export-cli/shell-completions/apictl_zsh_completions.sh
+++ b/import-export-cli/shell-completions/apictl_zsh_completions.sh
@@ -17,20 +17,26 @@ case $state in
   ;;
   level2)
     case $words[2] in
+      delete)
+        _arguments '2: :(api api-product app help)'
+      ;;
       export)
         _arguments '2: :(api-product help)'
       ;;
       install)
         _arguments '2: :(api-operator help wso2am-operator)'
       ;;
-      list)
-        _arguments '2: :(api-products apis apps envs help)'
+      remove)
+        _arguments '2: :(env help)'
       ;;
       uninstall)
         _arguments '2: :(api-operator help wso2am-operator)'
       ;;
-      delete)
-        _arguments '2: :(api api-product app help)'
+      update)
+        _arguments '2: :(api help)'
+      ;;
+      add)
+        _arguments '2: :(api help)'
       ;;
       change)
         _arguments '2: :(help registry)'
@@ -41,14 +47,8 @@ case $state in
       import)
         _arguments '2: :(api-product help)'
       ;;
-      remove)
-        _arguments '2: :(env help)'
-      ;;
-      update)
-        _arguments '2: :(api help)'
-      ;;
-      add)
-        _arguments '2: :(api help)'
+      list)
+        _arguments '2: :(api-products apis apps envs help)'
       ;;
       *)
         _arguments '*: :_files'