diff --git a/oc_relax-python-depends.patch b/oc_relax-python-depends.patch
index 29783aa..8a46feb 100644
--- a/oc_relax-python-depends.patch
+++ b/oc_relax-python-depends.patch
@@ -1,6 +1,6 @@
-diff -Nru oci-cli-3.16.0.orig/requirements.txt oci-cli-3.16.0/requirements.txt
---- oci-cli-3.16.0.orig/requirements.txt	2022-09-06 22:30:24.000000000 +0200
-+++ oci-cli-3.16.0/requirements.txt	2022-09-13 15:48:41.288746269 +0200
+diff -Nru oci-cli-3.18.0.orig/requirements.txt oci-cli-3.18.0/requirements.txt
+--- oci-cli-3.18.0.orig/requirements.txt	2022-09-28 00:50:08.000000000 +0200
++++ oci-cli-3.18.0/requirements.txt	2022-09-29 11:45:07.455751956 +0200
 @@ -2,41 +2,41 @@
  # (https://pip.pypa.io/en/stable/reference/pip_install/#requirements-file-format),
  # you may need to use the --extra-index-url option instead.
@@ -18,7 +18,7 @@ diff -Nru oci-cli-3.16.0.orig/requirements.txt oci-cli-3.16.0/requirements.txt
 -jmespath==0.10.0
 -ndg-httpsclient==0.4.2
 -mock==2.0.0
--oci==2.81.0
+-oci==2.84.0
 -packaging==20.2
 -pluggy==0.13.0
 -py==1.10.0
@@ -37,7 +37,7 @@ diff -Nru oci-cli-3.16.0.orig/requirements.txt oci-cli-3.16.0/requirements.txt
 +jmespath>=0.10.0
 +ndg-httpsclient>=0.4.2
 +mock>=2.0.0
-+oci>=2.81.0
++oci>=2.84.0
 +packaging>=20.2
 +pluggy>=0.13.0
 +py>=1.10.0
@@ -75,15 +75,15 @@ diff -Nru oci-cli-3.16.0.orig/requirements.txt oci-cli-3.16.0/requirements.txt
 +PyYAML>=5.4
 +docutils>=0.15.2
 +prompt-toolkit>=3.0.29
-diff -Nru oci-cli-3.16.0.orig/setup.py oci-cli-3.16.0/setup.py
---- oci-cli-3.16.0.orig/setup.py	2022-09-06 22:30:24.000000000 +0200
-+++ oci-cli-3.16.0/setup.py	2022-09-13 15:48:05.805408062 +0200
+diff -Nru oci-cli-3.18.0.orig/setup.py oci-cli-3.18.0/setup.py
+--- oci-cli-3.18.0.orig/setup.py	2022-09-28 00:50:08.000000000 +0200
++++ oci-cli-3.18.0/setup.py	2022-09-29 11:45:45.796411459 +0200
 @@ -29,23 +29,23 @@
      readme = f.read()
  
  requires = [
--    'oci==2.81.0',
-+    'oci>=2.81.0',
+-    'oci==2.84.0',
++    'oci>=2.84.0',
      'arrow>=1.0.0',
      'certifi',
 -    'click==7.1.2',
diff --git a/oci-cli-3.16.0.tar.gz b/oci-cli-3.16.0.tar.gz
deleted file mode 100644
index 3eaea42..0000000
--- a/oci-cli-3.16.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dfbc04471b6e88b14eb7169a62240ee3984260cc3e141b325f9b24680883688e
-size 2650499
diff --git a/oci-cli-3.18.0.tar.gz b/oci-cli-3.18.0.tar.gz
new file mode 100644
index 0000000..784cbff
--- /dev/null
+++ b/oci-cli-3.18.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4a749e6e30a6667d072a9af677a65ef3e1ba8d7dd84ae49f1ee13d5bfc3b5a51
+size 2711278
diff --git a/oci-cli.changes b/oci-cli.changes
index 0f0d7c8..e1b2cc6 100644
--- a/oci-cli.changes
+++ b/oci-cli.changes
@@ -1,3 +1,112 @@
+-------------------------------------------------------------------
+Thu Sep 29 08:57:21 UTC 2022 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
+
+- Update to version 3.18.0
+  * Support for previous pagination in Resource Search service
+    * ``oci search resource structured-search --page $opc-previous-token``
+  * Support for Elastic Compute feature as part of database service
+    * ``oci db exadata-infrastructure generate-recommended-vm-cluster-network --db-servers``
+    * ``oci db exadata-infrastructure update --additional-compute-count,
+      --additional-compute-system-model``
+    * ``oci db vm-cluster-network resize --action, --exadata-infrastructure-id,
+      --vm-cluster-network-id, --vm-networks``
+  * Stack Monitoring service
+    * Support for new command
+      * ``oci stack-monitoring resource search-associated-resources``
+    * Support for new optional parameter
+      * ``oci stack-monitoring resource search --external-id``
+      * ``oci stack-monitoring resource create --external-id``
+      * ``oci stack-monitoring resource delete --is-delete-members``
+  * NoSQL service
+    * ``oci nosql query prepare``
+      * Added a new optional argument ``--is-get-query-plan``
+      * Added the optional ``queryPlan`` property in the JSON response
+    * ``oci nosql table get``
+      * Added the properties ``isAsUuid`` and ``isGenerated`` to the ``Column``
+        JSON object that is included in the JSON response
+      * Added the ``identity`` JSON object that is included in the the JSON response
+    * ``oci nosql table list-table-usage``
+      * Added the property ``maxShardSizeUsageInPercent`` in the JSON response
+  * [BREAKING]  DNS service
+    *  ``oci dns resolver-endpoint create --subnet-id --nsg-ids``
+      * Required parameter ``--subnet-id`` was added
+      * Optional paramater ``--nsg-ids`` was added
+      * Optional paramater ``--endpoint-type`` was removed
+    * ``oci dns resolver-endpoint update``
+      * The optional paramater ``--nsg-ids`` was added
+- from version 3.17.0
+  * Support for the Cloud Migrations service
+    * ``oci cloud-migrations``
+  * Support for the Cloud Bridge service
+    * ``oci cloud-bridge``
+  * Support for listing summary messages, trail files, and trail file
+    sequences for a deployment in the Golden Gate service
+    * ``oci goldengate message-summary list-messages``
+    * ``oci goldengate trail-file-summary list-trail-files``
+    * ``oci goldengate trail-sequence-summary list-trail-sequences``
+  * Threat Intelligence service
+    * Support for new command
+      * ``oci threat-intelligence indicator summarize``
+    * Support for new optional parameters
+      * ``oci threat-intelligence indicator-summaries list-indicators --time-created-after
+        --time-created-before --time-last-seen-after --time-last-seen-before --time-updated-before``
+  * Log Analytics service
+    * Support for new commands
+      * ``oci log-analytics ingest-time-rule``
+      * ``oci log-analytics rule list``
+    * Support for new optional parameters
+      * ``oci log-analytics object-collection-rule create --log-set
+        --log-set-ext-regex --log-set-key --timezone``
+      * ``oci log-analytics object-collection-rule update --log-set
+        --log-set-ext-regex --log-set-key --timezone``
+      * ``oci log-analytics storage recall-archived-data --log-sets --query-string``
+  * Support for new commands in the DevOps service
+    * ``oci devops connection create-vbs-connection``
+    * ``oci devops connection update-vbs-connection``
+    * ``oci devops trigger create-vbs-trigger``
+    * ``oci devops trigger update-vbs-trigger``
+  * Support for new optional parameters in the Usage service
+    * ``oci usage-api schedule create --output-file-format --saved-report-id --description``
+    * ``oci usage-api schedule update --output-file-format --result-location --description``
+  * Data integration service
+    * Support for new commands
+      * ``oci data-integration runtime-operator get``
+      * ``oci data-integration runtime-operators list-runtime-operators``
+      * ``oci data-integration runtime-pipeline get``
+      * ``oci data-integration runtime-pipelines list-runtime-pipelines``
+      * ``oci data-integration task-run-lineage list-task-run-lineages``
+      * ``oci data-integration task-run-lineage list_taskrun_lineages``
+    * Support for new optional parameters
+      * ``oci data-integration data-entity list --include-types``
+      * ``oci data-integration data-flow-validation create
+        --target-field-map-summary --typed-object-map``
+      * ``oci data-integration dis-application create --compartment-id``
+      * ``oci data-integration schema list --include-types``
+      * ``oci data-integration workspace create --endpoint-compartment-id --endpoint-id
+        --endpoint-name --registry-compartment-id --registry-id --registry-name``
+  * [BREAKING] oci governance-rules-control-plane work-request work-request-log
+    list renamed in the Governance Rules Control Plane service
+    * ``oci governance-rules-control-plane work-request
+      work-request-log-entry list-work-request-logs``
+  * [BREAKING] --previous-deployment-id is now a required parameter in the DevOps service
+    * ``oci devops deployment create-pipeline-redeployment --previous-deployment-id``
+  * The parameter --query-properties is now optional in the Usage service
+    * ``oci usage-api schedule create``
+- from version 3.16.1
+  * Support for calling Oracle Cloud Infrastructure services
+    in the Madrid region (``--region eu-madrid-1``)
+  * Data Science service
+    * Support for new optional parameter
+      * ``oci data-science model create-model-artifact --if-match``
+    * Support for new commands
+      * ``oci data-science model export-model-artifact``
+      * ``oci data-science model export-model-artifact-artifact-export-details-object-storage``
+      * ``oci data-science model import-model-artifact``
+      * ``oci data-science model import-model-artifact-artifact-import-details-object-storage``
+- Refresh patches for new version
+    + oc_relax-python-depends.patch
+- Update BuildRequires and Requires from setup.py
+
 -------------------------------------------------------------------
 Tue Sep 13 13:49:07 UTC 2022 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
 
diff --git a/oci-cli.spec b/oci-cli.spec
index 744be24..4b316bd 100644
--- a/oci-cli.spec
+++ b/oci-cli.spec
@@ -28,7 +28,7 @@
 %bcond_with test
 %endif
 Name:           oci-cli%{psuffix}
-Version:        3.16.0
+Version:        3.18.0
 Release:        0
 Summary:        Oracle Cloud Infrastructure CLI
 License:        Apache-2.0
@@ -46,7 +46,7 @@ BuildRequires:  python3-click >= 7.1.2
 BuildRequires:  python3-cryptography >= 3.2.1
 BuildRequires:  python3-devel
 BuildRequires:  python3-jmespath >= 0.10.0
-BuildRequires:  python3-oci-sdk >= 2.81.0
+BuildRequires:  python3-oci-sdk >= 2.84.0
 BuildRequires:  python3-pyOpenSSL >= 19.1.0
 BuildRequires:  python3-python-dateutil >= 2.5.3
 BuildRequires:  python3-pytz >= 2016.10
@@ -82,7 +82,7 @@ Requires:       python3-certifi
 Requires:       python3-click >= 7.1.2
 Requires:       python3-cryptography >= 3.2.1
 Requires:       python3-jmespath >= 0.10.0
-Requires:       python3-oci-sdk >= 2.81.0
+Requires:       python3-oci-sdk >= 2.84.0
 Requires:       python3-prompt_toolkit >= 3.0.29
 Requires:       python3-pyOpenSSL >= 19.1.0
 Requires:       python3-python-dateutil >= 2.5.3