diff --git a/Cargo.lock b/Cargo.lock
index 757b0c3d6..49f35e30c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -197,22 +197,22 @@ dependencies = [
 
 [[package]]
 name = "cw-address-like"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b137a72f7ed4eaf591ec1bba7aedb062cde38ff08086276d8de6e37dc9b98621"
+checksum = "451a4691083a88a3c0630a8a88799e9d4cd6679b7ce8ff22b8da2873ff31d380"
 dependencies = [
  "cosmwasm-std",
 ]
 
 [[package]]
 name = "cw-multi-test"
-version = "0.16.2"
+version = "0.16.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2eb84554bbfa6b66736abcd6a9bfdf237ee0ecb83910f746dff7f799093c80a"
+checksum = "127c7bb95853b8e828bdab97065c81cb5ddc20f7339180b61b2300565aaa99d1"
 dependencies = [
  "anyhow",
  "cosmwasm-std",
- "cw-storage-plus 1.0.1",
+ "cw-storage-plus 1.1.0",
  "cw-utils 1.0.1",
  "derivative",
  "itertools",
@@ -225,24 +225,24 @@ dependencies = [
 
 [[package]]
 name = "cw-ownable"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27fc0c75fc61cf268e5dc5f23ff24bd84b629c575b5a1522e2349f61b46874b4"
+checksum = "093dfb4520c48b5848274dd88ea99e280a04bc08729603341c7fb0d758c74321"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
  "cw-address-like",
  "cw-ownable-derive",
- "cw-storage-plus 1.0.1",
+ "cw-storage-plus 1.1.0",
  "cw-utils 1.0.1",
  "thiserror",
 ]
 
 [[package]]
 name = "cw-ownable-derive"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac447d5b5314ee18c2663b5436451c030c072db1eb392a167d19c04e247d77f6"
+checksum = "a1d3bf2e0f341bb6cc100d7d441d31cf713fbd3ce0c511f91e79f14b40a889af"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -262,9 +262,9 @@ dependencies = [
 
 [[package]]
 name = "cw-storage-plus"
-version = "1.0.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "053a5083c258acd68386734f428a5a171b29f7d733151ae83090c6fcc9417ffa"
+checksum = "3f0e92a069d62067f3472c62e30adedb4cab1754725c0f2a682b3128d2bf3c79"
 dependencies = [
  "cosmwasm-std",
  "schemars",
@@ -294,7 +294,7 @@ checksum = "c80e93d1deccb8588db03945016a292c3c631e6325d349ebb35d2db6f4f946f7"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cw2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cw2 1.1.0",
  "schemars",
  "semver",
  "serde",
@@ -316,25 +316,13 @@ dependencies = [
 
 [[package]]
 name = "cw2"
-version = "1.0.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fb70cee2cf0b4a8ff7253e6bc6647107905e8eb37208f87d54f67810faa62f8"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-storage-plus 1.0.1",
- "schemars",
- "serde",
-]
-
-[[package]]
-name = "cw2"
-version = "1.0.1"
-source = "git+https://github.com/mars-protocol/cw-plus?rev=1a3a944#1a3a944b64cf6e9fcfada48f2b09aaa1a90aef74"
+checksum = "29ac2dc7a55ad64173ca1e0a46697c31b7a5c51342f55a1e84a724da4eb99908"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cw-storage-plus 1.0.1",
+ "cw-storage-plus 1.1.0",
  "schemars",
  "serde",
  "thiserror",
@@ -342,9 +330,9 @@ dependencies = [
 
 [[package]]
 name = "cw20"
-version = "1.0.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91666da6c7b40c8dd5ff94df655a28114efc10c79b70b4d06f13c31e37d60609"
+checksum = "011c45920f8200bd5d32d4fe52502506f64f2f75651ab408054d4cfc75ca3a9b"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -355,13 +343,13 @@ dependencies = [
 
 [[package]]
 name = "cw2981-royalties"
-version = "0.17.0"
+version = "0.18.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cw2 1.0.1 (git+https://github.com/mars-protocol/cw-plus?rev=1a3a944)",
- "cw721 0.17.0",
- "cw721-base 0.17.0",
+ "cw2 1.1.0",
+ "cw721 0.18.0",
+ "cw721-base 0.18.0",
  "schemars",
  "serde",
  "thiserror",
@@ -382,7 +370,7 @@ dependencies = [
 
 [[package]]
 name = "cw721"
-version = "0.17.0"
+version = "0.18.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -410,16 +398,16 @@ dependencies = [
 
 [[package]]
 name = "cw721-base"
-version = "0.17.0"
+version = "0.18.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
  "cw-multi-test",
  "cw-ownable",
- "cw-storage-plus 1.0.1",
+ "cw-storage-plus 1.1.0",
  "cw-utils 1.0.1",
- "cw2 1.0.1 (git+https://github.com/mars-protocol/cw-plus?rev=1a3a944)",
- "cw721 0.17.0",
+ "cw2 1.1.0",
+ "cw721 0.18.0",
  "cw721-base 0.16.0",
  "schemars",
  "serde",
@@ -428,15 +416,15 @@ dependencies = [
 
 [[package]]
 name = "cw721-fixed-price"
-version = "0.17.0"
+version = "0.18.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cw-storage-plus 1.0.1",
+ "cw-storage-plus 1.1.0",
  "cw-utils 1.0.1",
- "cw2 1.0.1 (git+https://github.com/mars-protocol/cw-plus?rev=1a3a944)",
+ "cw2 1.1.0",
  "cw20",
- "cw721-base 0.17.0",
+ "cw721-base 0.18.0",
  "prost 0.10.4",
  "schemars",
  "serde",
@@ -445,27 +433,27 @@ dependencies = [
 
 [[package]]
 name = "cw721-metadata-onchain"
-version = "0.17.0"
+version = "0.18.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cw2 1.0.1 (git+https://github.com/mars-protocol/cw-plus?rev=1a3a944)",
- "cw721 0.17.0",
- "cw721-base 0.17.0",
+ "cw2 1.1.0",
+ "cw721 0.18.0",
+ "cw721-base 0.18.0",
  "schemars",
  "serde",
 ]
 
 [[package]]
 name = "cw721-non-transferable"
-version = "0.17.0"
+version = "0.18.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cw-storage-plus 1.0.1",
- "cw2 1.0.1 (git+https://github.com/mars-protocol/cw-plus?rev=1a3a944)",
- "cw721 0.17.0",
- "cw721-base 0.17.0",
+ "cw-storage-plus 1.1.0",
+ "cw2 1.1.0",
+ "cw721 0.18.0",
+ "cw721-base 0.18.0",
  "schemars",
  "serde",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 3fc75c507..786af03c9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,7 @@
 members = ["packages/*", "contracts/*"]
 
 [workspace.package]
-version       = "0.17.0"
+version       = "0.18.0"
 edition       = "2021"
 license       = "Apache-2.0"
 repository    = "https://github.com/CosmWasm/cw-nfts"
@@ -13,16 +13,14 @@ rust-version  = "1.65"
 [workspace.dependencies]
 cosmwasm-schema = "1.2.1"
 cosmwasm-std    = "1.2.1"
-# FIXME: change back to the "official" crates.io release after this PR is merged:
-# https://github.com/CosmWasm/cw-plus/pull/858
-cw2             = { git = "https://github.com/mars-protocol/cw-plus", rev = "1a3a944" }
-cw20            = "1.0.1"
-cw721           = { version = "0.17.0", path = "./packages/cw721" }
-cw721-base      = { version = "0.17.0", path = "./contracts/cw721-base" }
+cw2             = "1.1.0"
+cw20            = "1.1.0"
+cw721           = { version = "0.18.0", path = "./packages/cw721" }
+cw721-base      = { version = "0.18.0", path = "./contracts/cw721-base" }
 cw721-base-016  = { version = "0.16.0", package = "cw721-base" }
-cw-multi-test   = "0.16.2"
-cw-ownable      = "0.5.0"
-cw-storage-plus = "1.0.1"
+cw-multi-test   = "0.16.5"
+cw-ownable      = "0.5.1"
+cw-storage-plus = "1.1.0"
 cw-utils        = "1.0.1"
 schemars        = "0.8.11"
 serde           = { version = "1.0.152", default-features = false, features = ["derive"] }
@@ -30,24 +28,24 @@ thiserror       = "1.0.38"
 
 [profile.release.package.cw721-base]
 codegen-units = 1
-incremental = false
+incremental   = false
 
 [profile.release.package.cw721-metadata-onchain]
 codegen-units = 1
-incremental = false
+incremental   = false
 
 [profile.release.package.cw721-fixed-price]
 codegen-units = 1
-incremental = false
+incremental   = false
 
 [profile.release.package.cw721-non-transferable]
 codegen-units = 1
-incremental = false
+incremental   = false
 
 [profile.release]
-rpath = false
-lto = true
-overflow-checks = true
-opt-level = 3
-debug = false
+rpath            = false
+lto              = true
+overflow-checks  = true
+opt-level        = 3
+debug            = false
 debug-assertions = false
diff --git a/contracts/cw2981-royalties/schema/cw2981-royalties.json b/contracts/cw2981-royalties/schema/cw2981-royalties.json
index aa960907e..b1acab15b 100644
--- a/contracts/cw2981-royalties/schema/cw2981-royalties.json
+++ b/contracts/cw2981-royalties/schema/cw2981-royalties.json
@@ -1,6 +1,6 @@
 {
   "contract_name": "cw2981-royalties",
-  "contract_version": "0.17.0",
+  "contract_version": "0.18.0",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",
diff --git a/contracts/cw721-base/schema/cw721-base.json b/contracts/cw721-base/schema/cw721-base.json
index aca1b3439..085949fca 100644
--- a/contracts/cw721-base/schema/cw721-base.json
+++ b/contracts/cw721-base/schema/cw721-base.json
@@ -1,6 +1,6 @@
 {
   "contract_name": "cw721-base",
-  "contract_version": "0.17.0",
+  "contract_version": "0.18.0",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",
diff --git a/contracts/cw721-fixed-price/schema/cw721-fixed-price.json b/contracts/cw721-fixed-price/schema/cw721-fixed-price.json
index 7304862cf..34cd69b39 100644
--- a/contracts/cw721-fixed-price/schema/cw721-fixed-price.json
+++ b/contracts/cw721-fixed-price/schema/cw721-fixed-price.json
@@ -1,6 +1,6 @@
 {
   "contract_name": "cw721-fixed-price",
-  "contract_version": "0.17.0",
+  "contract_version": "0.18.0",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",
diff --git a/contracts/cw721-metadata-onchain/schema/cw721-metadata-onchain.json b/contracts/cw721-metadata-onchain/schema/cw721-metadata-onchain.json
index ea0ee7afb..eff29e2a3 100644
--- a/contracts/cw721-metadata-onchain/schema/cw721-metadata-onchain.json
+++ b/contracts/cw721-metadata-onchain/schema/cw721-metadata-onchain.json
@@ -1,6 +1,6 @@
 {
   "contract_name": "cw721-metadata-onchain",
-  "contract_version": "0.17.0",
+  "contract_version": "0.18.0",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",