diff --git a/Gemfile b/Gemfile
index 3b7d94934d8..d4ca8bb65b8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -164,7 +164,7 @@ gem "meta-tags", "~> 2.20.0"
 
 gem "paper_trail", "~> 15.1.0"
 
-gem "clamav-client", github: "honestica/clamav-client", ref: "29e78ae94307cb34e79ddd29c5da79752239d8b7"
+gem "op-clamav-client", "~> 3.4", require: "clamav"
 
 group :production do
   # we use dalli as standard memcache client
diff --git a/Gemfile.lock b/Gemfile.lock
index 4b2bb68435b..274a23ee027 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,13 +6,6 @@ GIT
     capybara_accessible_selectors (0.11.0)
       capybara (~> 3.36)
 
-GIT
-  remote: https://github.com/honestica/clamav-client.git
-  revision: 29e78ae94307cb34e79ddd29c5da79752239d8b7
-  ref: 29e78ae94307cb34e79ddd29c5da79752239d8b7
-  specs:
-    clamav-client (3.4.2)
-
 GIT
   remote: https://github.com/opf/md-to-pdf
   revision: 8f14736a88ad0064d2a97be108fe7061ffbcee91
@@ -760,6 +753,7 @@ GEM
     omniauth-saml (1.10.3)
       omniauth (~> 1.3, >= 1.3.2)
       ruby-saml (~> 1.9)
+    op-clamav-client (3.4.2)
     open4 (1.3.4)
     openid_connect (2.2.1)
       activemodel
@@ -1191,7 +1185,6 @@ DEPENDENCIES
   capybara_accessible_selectors!
   carrierwave (~> 1.3.1)
   carrierwave_direct (~> 2.1.0)
-  clamav-client!
   climate_control
   closure_tree (~> 7.4.0)
   colored2
@@ -1257,6 +1250,7 @@ DEPENDENCIES
   omniauth-openid-connect!
   omniauth-openid_connect-providers!
   omniauth-saml (~> 1.10.1)
+  op-clamav-client (~> 3.4)
   openproject-auth_plugins!
   openproject-auth_saml!
   openproject-avatars!