diff --git a/installers/charm/juju-simplestreams-operator/requirements.txt b/installers/charm/juju-simplestreams-operator/requirements.txt
index cb303a319dc2a43ce3dbec140b44f3133717c98e..398d4ad32386c88597ace15fd62c727d4c584f1d 100644
--- a/installers/charm/juju-simplestreams-operator/requirements.txt
+++ b/installers/charm/juju-simplestreams-operator/requirements.txt
@@ -17,7 +17,7 @@
 #
 # To get in touch with the maintainers, please contact:
 # osm-charmers@lists.launchpad.net
-ops >= 1.2.0
+ops < 2.2
 lightkube
 lightkube-models
 # git+https://github.com/charmed-osm/config-validator/
diff --git a/installers/charm/osm-lcm/requirements.txt b/installers/charm/osm-lcm/requirements.txt
index cb303a319dc2a43ce3dbec140b44f3133717c98e..398d4ad32386c88597ace15fd62c727d4c584f1d 100644
--- a/installers/charm/osm-lcm/requirements.txt
+++ b/installers/charm/osm-lcm/requirements.txt
@@ -17,7 +17,7 @@
 #
 # To get in touch with the maintainers, please contact:
 # osm-charmers@lists.launchpad.net
-ops >= 1.2.0
+ops < 2.2
 lightkube
 lightkube-models
 # git+https://github.com/charmed-osm/config-validator/
diff --git a/installers/charm/osm-lcm/tox.ini b/installers/charm/osm-lcm/tox.ini
index 16c1359f4cdd0c6e0fbb5f7a464e18bea9c52860..238adaae973f9d0a33fd5317da1f674be1c5badb 100644
--- a/installers/charm/osm-lcm/tox.ini
+++ b/installers/charm/osm-lcm/tox.ini
@@ -60,7 +60,7 @@ deps =
     isort
     codespell
 commands =
-    codespell {toxinidir}/. --skip {toxinidir}/.git --skip {toxinidir}/.tox \
+    codespell {toxinidir} --skip {toxinidir}/.git --skip {toxinidir}/.tox \
       --skip {toxinidir}/build --skip {toxinidir}/lib --skip {toxinidir}/venv \
       --skip {toxinidir}/.mypy_cache --skip {toxinidir}/icon.svg
     # pflake8 wrapper supports config from pyproject.toml
diff --git a/installers/charm/osm-mon/requirements.txt b/installers/charm/osm-mon/requirements.txt
index cb303a319dc2a43ce3dbec140b44f3133717c98e..398d4ad32386c88597ace15fd62c727d4c584f1d 100644
--- a/installers/charm/osm-mon/requirements.txt
+++ b/installers/charm/osm-mon/requirements.txt
@@ -17,7 +17,7 @@
 #
 # To get in touch with the maintainers, please contact:
 # osm-charmers@lists.launchpad.net
-ops >= 1.2.0
+ops < 2.2
 lightkube
 lightkube-models
 # git+https://github.com/charmed-osm/config-validator/
diff --git a/installers/charm/osm-mon/tox.ini b/installers/charm/osm-mon/tox.ini
index 46b127d7bf3ede999ef11fd949fc03987581806c..ece4dcea67f7a81c60eaea80b28da73243bf9cca 100644
--- a/installers/charm/osm-mon/tox.ini
+++ b/installers/charm/osm-mon/tox.ini
@@ -60,7 +60,7 @@ deps =
     isort
     codespell
 commands =
-    codespell {toxinidir}/. --skip {toxinidir}/.git --skip {toxinidir}/.tox \
+    codespell {toxinidir} --skip {toxinidir}/.git --skip {toxinidir}/.tox \
       --skip {toxinidir}/build --skip {toxinidir}/lib --skip {toxinidir}/venv \
       --skip {toxinidir}/.mypy_cache --skip {toxinidir}/icon.svg
     # pflake8 wrapper supports config from pyproject.toml
diff --git a/installers/charm/osm-nbi/requirements.txt b/installers/charm/osm-nbi/requirements.txt
index 5ee9d5cfd376c684f341594df6e255c52f2fd49b..761edd852eba304fab347366f1b425cb71b5578f 100644
--- a/installers/charm/osm-nbi/requirements.txt
+++ b/installers/charm/osm-nbi/requirements.txt
@@ -17,7 +17,7 @@
 #
 # To get in touch with the maintainers, please contact:
 # osm-charmers@lists.launchpad.net
-ops >= 1.2.0
+ops < 2.2
 lightkube
 lightkube-models
 git+https://github.com/charmed-osm/config-validator/
diff --git a/installers/charm/osm-nbi/tox.ini b/installers/charm/osm-nbi/tox.ini
index e24bef5275d13546865fec14917945ff860ca493..23ecc4c186e69382559317ab7a405b44b4906ad5 100644
--- a/installers/charm/osm-nbi/tox.ini
+++ b/installers/charm/osm-nbi/tox.ini
@@ -63,7 +63,7 @@ deps =
 commands =
     # uncomment the following line if this charm owns a lib
     codespell {[vars]lib_path}
-    codespell {toxinidir}/. --skip {toxinidir}/.git --skip {toxinidir}/.tox \
+    codespell {toxinidir} --skip {toxinidir}/.git --skip {toxinidir}/.tox \
       --skip {toxinidir}/build --skip {toxinidir}/lib --skip {toxinidir}/venv \
       --skip {toxinidir}/.mypy_cache --skip {toxinidir}/icon.svg
     # pflake8 wrapper supports config from pyproject.toml
diff --git a/installers/charm/osm-ng-ui/requirements.txt b/installers/charm/osm-ng-ui/requirements.txt
index 5ee9d5cfd376c684f341594df6e255c52f2fd49b..761edd852eba304fab347366f1b425cb71b5578f 100644
--- a/installers/charm/osm-ng-ui/requirements.txt
+++ b/installers/charm/osm-ng-ui/requirements.txt
@@ -17,7 +17,7 @@
 #
 # To get in touch with the maintainers, please contact:
 # osm-charmers@lists.launchpad.net
-ops >= 1.2.0
+ops < 2.2
 lightkube
 lightkube-models
 git+https://github.com/charmed-osm/config-validator/
diff --git a/installers/charm/osm-pol/requirements.txt b/installers/charm/osm-pol/requirements.txt
index cb303a319dc2a43ce3dbec140b44f3133717c98e..398d4ad32386c88597ace15fd62c727d4c584f1d 100644
--- a/installers/charm/osm-pol/requirements.txt
+++ b/installers/charm/osm-pol/requirements.txt
@@ -17,7 +17,7 @@
 #
 # To get in touch with the maintainers, please contact:
 # osm-charmers@lists.launchpad.net
-ops >= 1.2.0
+ops < 2.2
 lightkube
 lightkube-models
 # git+https://github.com/charmed-osm/config-validator/
diff --git a/installers/charm/osm-pol/tox.ini b/installers/charm/osm-pol/tox.ini
index 16c1359f4cdd0c6e0fbb5f7a464e18bea9c52860..238adaae973f9d0a33fd5317da1f674be1c5badb 100644
--- a/installers/charm/osm-pol/tox.ini
+++ b/installers/charm/osm-pol/tox.ini
@@ -60,7 +60,7 @@ deps =
     isort
     codespell
 commands =
-    codespell {toxinidir}/. --skip {toxinidir}/.git --skip {toxinidir}/.tox \
+    codespell {toxinidir} --skip {toxinidir}/.git --skip {toxinidir}/.tox \
       --skip {toxinidir}/build --skip {toxinidir}/lib --skip {toxinidir}/venv \
       --skip {toxinidir}/.mypy_cache --skip {toxinidir}/icon.svg
     # pflake8 wrapper supports config from pyproject.toml
diff --git a/installers/charm/osm-ro/requirements.txt b/installers/charm/osm-ro/requirements.txt
index cb303a319dc2a43ce3dbec140b44f3133717c98e..398d4ad32386c88597ace15fd62c727d4c584f1d 100644
--- a/installers/charm/osm-ro/requirements.txt
+++ b/installers/charm/osm-ro/requirements.txt
@@ -17,7 +17,7 @@
 #
 # To get in touch with the maintainers, please contact:
 # osm-charmers@lists.launchpad.net
-ops >= 1.2.0
+ops < 2.2
 lightkube
 lightkube-models
 # git+https://github.com/charmed-osm/config-validator/
diff --git a/installers/charm/osm-ro/tox.ini b/installers/charm/osm-ro/tox.ini
index 0451ff1a023b2b9c5012cef0565e614804f61bc5..e3b47806b0c5be6eb871e992528c7385a0c6506a 100644
--- a/installers/charm/osm-ro/tox.ini
+++ b/installers/charm/osm-ro/tox.ini
@@ -63,7 +63,7 @@ deps =
 commands =
     # uncomment the following line if this charm owns a lib
     codespell {[vars]lib_path} --ignore-words-list=Ro,RO,ro
-    codespell {toxinidir}/. --skip {toxinidir}/.git --skip {toxinidir}/.tox \
+    codespell {toxinidir} --skip {toxinidir}/.git --skip {toxinidir}/.tox \
       --skip {toxinidir}/build --skip {toxinidir}/lib --skip {toxinidir}/venv \
       --skip {toxinidir}/.mypy_cache --skip {toxinidir}/icon.svg --ignore-words-list=Ro,RO,ro
     # pflake8 wrapper supports config from pyproject.toml
diff --git a/installers/charm/vca-integrator-operator/charmcraft.yaml b/installers/charm/vca-integrator-operator/charmcraft.yaml
index 0d7d5ebc3add07504b15ba86e92edd69e91f8141..95d0e96d7eb869855bef9ca876f95a95606037cf 100644
--- a/installers/charm/vca-integrator-operator/charmcraft.yaml
+++ b/installers/charm/vca-integrator-operator/charmcraft.yaml
@@ -25,11 +25,6 @@ bases:
         channel: "20.04"
 parts:
   charm:
-    build-environment:
-    - CRYPTOGRAPHY_DONT_BUILD_RUST: 1
+    charm-binary-python-packages: [cryptography, bcrypt]
     build-packages:
-      - build-essential
-      - libssl-dev
-      - libffi-dev
-      - python3-dev
-      - cargo
+      - libffi-dev
\ No newline at end of file
diff --git a/installers/charm/vca-integrator-operator/requirements.txt b/installers/charm/vca-integrator-operator/requirements.txt
index 66e845a38e78b9fb92c2ae8cacff957692f2e78a..014a28ddc6251fc82fd7820f4c2a961226a26952 100644
--- a/installers/charm/vca-integrator-operator/requirements.txt
+++ b/installers/charm/vca-integrator-operator/requirements.txt
@@ -14,6 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #######################################################################################
-ops >= 1.2.0
-juju
+ops < 2.2
+juju < 3
 pyyaml
\ No newline at end of file
diff --git a/installers/charm/vca-integrator-operator/tox.ini b/installers/charm/vca-integrator-operator/tox.ini
index 605d69076d2a2ed2f7923af16abb1ae4e0f33cde..e063dd4fb54d9fa1a1fd2abef4c8931133e4f7d5 100644
--- a/installers/charm/vca-integrator-operator/tox.ini
+++ b/installers/charm/vca-integrator-operator/tox.ini
@@ -62,7 +62,7 @@ deps =
     -r{toxinidir}/requirements.txt
 commands =
     codespell {[vars]lib_path}
-    codespell {toxinidir}/. --skip {toxinidir}/.git --skip {toxinidir}/.tox \
+    codespell {toxinidir} --skip {toxinidir}/.git --skip {toxinidir}/.tox \
       --skip {toxinidir}/build --skip {toxinidir}/lib --skip {toxinidir}/venv \
       --skip {toxinidir}/.mypy_cache --skip {toxinidir}/icon.svg
     pylint -E {[vars]src_path}