diff --git a/src/git-mirage/git_mirage.ml b/src/git-mirage/git_mirage.ml
index 766245d56..94c1f6dc1 100644
--- a/src/git-mirage/git_mirage.ml
+++ b/src/git-mirage/git_mirage.ml
@@ -8,20 +8,27 @@ module Make
 struct
   let git_path = Mimic.make ~name:"git-path"
   let git_capabilities = Mimic.make ~name:"git-capabilities"
+  let git_scheme = Mimic.make ~name:"git-scheme"
   let with_git_path v ctx = Mimic.add git_path v ctx
   let fetch ctx = Mimic.add git_capabilities `Rd ctx
   let push ctx = Mimic.add git_capabilities `Wr ctx
+  let gri ctx = Mimic.add git_scheme `Git ctx
+  let ssh ctx = Mimic.add git_scheme `SSH ctx
+  let http ctx = Mimic.add git_scheme `HTTP ctx
+  let https ctx = Mimic.add git_scheme `HTTPS ctx
 
   let with_resolv ctx =
-    let k stack ipaddr port _path _cap =
-      Lwt.return_some (stack, ipaddr, port)
+    let k scheme stack ipaddr port _path _cap =
+      match scheme with
+      | `Git | `HTTP -> Lwt.return_some (stack, ipaddr, port)
+      | _ -> Lwt.return_none
     in
     Mimic.(
       fold TCP.tcp_endpoint
         Fun.
           [
-            req TCP.tcp_stack; req TCP.tcp_ipaddr; dft TCP.tcp_port 9418;
-            req git_path; dft git_capabilities `Rd;
+            req git_scheme; req TCP.tcp_stack; req TCP.tcp_ipaddr;
+            dft TCP.tcp_port 9418; req git_path; dft git_capabilities `Rd;
           ]
         ~k ctx)
 
@@ -29,6 +36,13 @@ struct
 
   let with_smart_git_endpoint edn ctx =
     match Smart_git.Endpoint.of_string edn with
-    | Ok { Smart_git.Endpoint.path; _ } -> with_git_path path ctx
+    | Ok { Smart_git.Endpoint.path; scheme = `SSH _; _ } ->
+        ssh (with_git_path path ctx)
+    | Ok { Smart_git.Endpoint.path; scheme = `Git; _ } ->
+        gri (with_git_path path ctx)
+    | Ok { Smart_git.Endpoint.path; scheme = `HTTP _; _ } ->
+        http (with_git_path path ctx)
+    | Ok { Smart_git.Endpoint.path; scheme = `HTTPS _; _ } ->
+        https (with_git_path path ctx)
     | _ -> ctx
 end
diff --git a/src/git-mirage/git_mirage.mli b/src/git-mirage/git_mirage.mli
index 4688f6d92..af48345fb 100644
--- a/src/git-mirage/git_mirage.mli
+++ b/src/git-mirage/git_mirage.mli
@@ -7,9 +7,14 @@ module Make
     end) : sig
   val git_path : string Mimic.value
   val git_capabilities : [ `Rd | `Wr ] Mimic.value
+  val git_scheme : [ `Git | `SSH | `HTTP | `HTTPS ] Mimic.value
   val with_git_path : string -> Mimic.ctx -> Mimic.ctx
   val fetch : Mimic.ctx -> Mimic.ctx
   val push : Mimic.ctx -> Mimic.ctx
+  val gri : Mimic.ctx -> Mimic.ctx
+  val ssh : Mimic.ctx -> Mimic.ctx
+  val http : Mimic.ctx -> Mimic.ctx
+  val https : Mimic.ctx -> Mimic.ctx
   val with_resolv : Mimic.ctx -> Mimic.ctx
   val ctx : Mimic.ctx
   val with_smart_git_endpoint : string -> Mimic.ctx -> Mimic.ctx
diff --git a/src/git-mirage/git_mirage_ssh.ml b/src/git-mirage/git_mirage_ssh.ml
index dbcec0f15..756c769fb 100644
--- a/src/git-mirage/git_mirage_ssh.ml
+++ b/src/git-mirage/git_mirage_ssh.ml
@@ -20,6 +20,7 @@ module Make
     end) (Git : sig
       val git_path : string Mimic.value
       val git_capabilities : [ `Rd | `Wr ] Mimic.value
+      val git_scheme : [ `Git | `SSH | `HTTP | `HTTPS ] Mimic.value
     end)
     (Mclock : Mirage_clock.MCLOCK) =
 struct
@@ -89,39 +90,43 @@ struct
     Mimic.add ssh_key v ctx
 
   let with_resolv ctx =
-    let k (stack, ipaddr, port) ssh_authenticator ssh_user ssh_key git_path
-        git_capabilities =
-      Lwt.return_some
-        {
-          stack;
-          ipaddr;
-          port;
-          authenticator = ssh_authenticator;
-          user = ssh_user;
-          key = ssh_key;
-          path = git_path;
-          capabilities = git_capabilities;
-        }
+    let k scheme (stack, ipaddr, port) ssh_authenticator ssh_user ssh_key
+        git_path git_capabilities =
+      match scheme with
+      | `SSH ->
+          Lwt.return_some
+            {
+              stack;
+              ipaddr;
+              port;
+              authenticator = ssh_authenticator;
+              user = ssh_user;
+              key = ssh_key;
+              path = git_path;
+              capabilities = git_capabilities;
+            }
+      | _ -> Lwt.return_none
     in
     let ctx =
       Mimic.(
         fold ssh_endpoint
           Fun.
             [
-              req TCP.tcp_endpoint; opt ssh_authenticator; req ssh_user;
-              req ssh_key; req Git.git_path; dft Git.git_capabilities `Rd;
+              req Git.git_scheme; req TCP.tcp_endpoint; opt ssh_authenticator;
+              req ssh_user; req ssh_key; req Git.git_path;
+              dft Git.git_capabilities `Rd;
             ]
           ~k ctx)
     in
-    let k stack ipaddr port = k (stack, ipaddr, port) in
+    let k scheme stack ipaddr port = k scheme (stack, ipaddr, port) in
     let ctx =
       Mimic.(
         fold ssh_endpoint
           Fun.
             [
-              req TCP.tcp_stack; req TCP.tcp_ipaddr; dft TCP.tcp_port 22;
-              opt ssh_authenticator; req ssh_user; req ssh_key;
-              req Git.git_path; dft Git.git_capabilities `Rd;
+              req Git.git_scheme; req TCP.tcp_stack; req TCP.tcp_ipaddr;
+              dft TCP.tcp_port 22; opt ssh_authenticator; req ssh_user;
+              req ssh_key; req Git.git_path; dft Git.git_capabilities `Rd;
             ]
           ~k ctx)
     in
diff --git a/src/git-mirage/git_mirage_ssh.mli b/src/git-mirage/git_mirage_ssh.mli
index 24291de3f..c9db26264 100644
--- a/src/git-mirage/git_mirage_ssh.mli
+++ b/src/git-mirage/git_mirage_ssh.mli
@@ -18,6 +18,7 @@ module Make
     end) (Git : sig
       val git_path : string Mimic.value
       val git_capabilities : [ `Rd | `Wr ] Mimic.value
+      val git_scheme : [ `Git | `SSH | `HTTP | `HTTPS ] Mimic.value
     end)
     (Mclock : Mirage_clock.MCLOCK) : sig
   type nonrec endpoint = Stack.t endpoint
diff --git a/src/git-unix/git_unix.ml b/src/git-unix/git_unix.ml
index fb0d9709c..52db45810 100644
--- a/src/git-unix/git_unix.ml
+++ b/src/git-unix/git_unix.ml
@@ -717,8 +717,8 @@ module Sync (Git_store : Git.S) (HTTP : Smart_git.HTTP) = struct
     Lwt.async fill;
     fun () -> Lwt_stream.get stream
 
-  let fetch ?(push_stdout = ignore) ?(push_stderr = ignore) ~ctx ?verify edn
-      store ?version ?capabilities ?deepen want =
+  let fetch ?(push_stdout = ignore) ?(push_stderr = ignore) ~ctx edn store
+      ?version ?capabilities ?deepen want =
     let dotgit = Git_store.dotgit store in
     let temp = Fpath.(dotgit / "tmp") in
     tmp temp "pack-%s.pack" >>= fun src ->
@@ -726,7 +726,7 @@ module Sync (Git_store : Git.S) (HTTP : Smart_git.HTTP) = struct
     tmp temp "pack-%s.idx" >>= fun idx ->
     let create_idx_stream () = stream_of_file idx in
     let create_pack_stream () = stream_of_file dst in
-    fetch ~push_stdout ~push_stderr ~ctx ?verify edn store ?version
-      ?capabilities ?deepen want ~src ~dst ~idx ~create_idx_stream
-      ~create_pack_stream temp temp
+    fetch ~push_stdout ~push_stderr ~ctx edn store ?version ?capabilities
+      ?deepen want ~src ~dst ~idx ~create_idx_stream ~create_pack_stream temp
+      temp
 end
diff --git a/src/git/mem.ml b/src/git/mem.ml
index 2ddd59cd4..270800277 100644
--- a/src/git/mem.ml
+++ b/src/git/mem.ml
@@ -473,8 +473,8 @@ module Sync (Git_store : Minimal.S) (HTTP : Smart_git.HTTP) = struct
     Lwt.async fill;
     fun () -> Lwt_stream.get stream
 
-  let fetch ?(push_stdout = ignore) ?(push_stderr = ignore) ~ctx ?verify edn
-      store ?version ?capabilities ?deepen want =
+  let fetch ?(push_stdout = ignore) ?(push_stderr = ignore) ~ctx edn store
+      ?version ?capabilities ?deepen want =
     let t_idx = Carton.Dec.Idx.Device.device () in
     let t_pck = Cstruct_append.device () in
     let index = Carton.Dec.Idx.Device.create t_idx in
@@ -489,7 +489,7 @@ module Sync (Git_store : Minimal.S) (HTTP : Smart_git.HTTP) = struct
       let pack = Cstruct_append.project t_pck dst in
       stream_of_cstruct pack
     in
-    fetch ~push_stdout ~push_stderr ~ctx ?verify edn store ?version
-      ?capabilities ?deepen want ~src ~dst ~idx:index ~create_idx_stream
-      ~create_pack_stream t_pck t_idx
+    fetch ~push_stdout ~push_stderr ~ctx edn store ?version ?capabilities
+      ?deepen want ~src ~dst ~idx:index ~create_idx_stream ~create_pack_stream
+      t_pck t_idx
 end
diff --git a/src/git/sync.ml b/src/git/sync.ml
index 1a756359c..ad39b3f65 100644
--- a/src/git/sync.ml
+++ b/src/git/sync.ml
@@ -31,7 +31,6 @@ module type S = sig
     ?push_stdout:(string -> unit) ->
     ?push_stderr:(string -> unit) ->
     ctx:Mimic.ctx ->
-    ?verify:(Smart_git.Endpoint.t -> Mimic.flow -> (unit, error) result Lwt.t) ->
     Smart_git.Endpoint.t ->
     store ->
     ?version:[> `V1 ] ->
@@ -42,7 +41,6 @@ module type S = sig
 
   val push :
     ctx:Mimic.ctx ->
-    ?verify:(Smart_git.Endpoint.t -> Mimic.flow -> (unit, error) result Lwt.t) ->
     Smart_git.Endpoint.t ->
     store ->
     ?version:[> `V1 ] ->
@@ -188,9 +186,9 @@ struct
   let ( >>? ) x f =
     x >>= function Ok x -> f x | Error err -> Lwt.return_error err
 
-  let fetch ?(push_stdout = ignore) ?(push_stderr = ignore) ~ctx ?verify
-      endpoint t ?version ?capabilities ?deepen want ~src ~dst ~idx
-      ~create_idx_stream ~create_pack_stream t_pck t_idx =
+  let fetch ?(push_stdout = ignore) ?(push_stderr = ignore) ~ctx endpoint t
+      ?version ?capabilities ?deepen want ~src ~dst ~idx ~create_idx_stream
+      ~create_pack_stream t_pck t_idx =
     let want, src_dst_mapping =
       match want with
       | (`All | `None) as x -> x, fun src -> [ src ]
@@ -216,7 +214,7 @@ struct
           `Some src_refs, src_dst_mapping
     in
     let ministore = Ministore.inj (t, Hashtbl.create 0x100) in
-    fetch ~push_stdout ~push_stderr ~ctx ?verify
+    fetch ~push_stdout ~push_stderr ~ctx
       (access, lightly_load t, heavily_load t)
       ministore endpoint ?version ?capabilities ?deepen want t_pck t_idx ~src
       ~dst ~idx
@@ -289,9 +287,9 @@ struct
         unshallow = (fun _ -> assert false);
       }
 
-  let push ~ctx ?verify endpoint t ?version ?capabilities cmds =
+  let push ~ctx endpoint t ?version ?capabilities cmds =
     let ministore = Ministore.inj (t, Hashtbl.create 0x100) in
-    push ~ctx ?verify
+    push ~ctx
       (access, lightly_load t, heavily_load t)
       ministore endpoint ?version ?capabilities cmds
 end
diff --git a/src/git/sync.mli b/src/git/sync.mli
index 86f46c077..4af896d6c 100644
--- a/src/git/sync.mli
+++ b/src/git/sync.mli
@@ -30,7 +30,6 @@ module type S = sig
     ?push_stdout:(string -> unit) ->
     ?push_stderr:(string -> unit) ->
     ctx:Mimic.ctx ->
-    ?verify:(Smart_git.Endpoint.t -> Mimic.flow -> (unit, error) result Lwt.t) ->
     Smart_git.Endpoint.t ->
     store ->
     ?version:[> `V1 ] ->
@@ -41,7 +40,6 @@ module type S = sig
 
   val push :
     ctx:Mimic.ctx ->
-    ?verify:(Smart_git.Endpoint.t -> Mimic.flow -> (unit, error) result Lwt.t) ->
     Smart_git.Endpoint.t ->
     store ->
     ?version:[> `V1 ] ->
@@ -71,7 +69,6 @@ module Make
     ?push_stdout:(string -> unit) ->
     ?push_stderr:(string -> unit) ->
     ctx:Mimic.ctx ->
-    ?verify:(Smart_git.Endpoint.t -> Mimic.flow -> (unit, 'err) result Lwt.t) ->
     Smart_git.Endpoint.t ->
     store ->
     ?version:[> `V1 ] ->
@@ -99,7 +96,6 @@ module Make
 
   val push :
     ctx:Mimic.ctx ->
-    ?verify:(Smart_git.Endpoint.t -> Mimic.flow -> (unit, 'err) result Lwt.t) ->
     Smart_git.Endpoint.t ->
     store ->
     ?version:[> `V1 ] ->
diff --git a/src/not-so-smart/smart_git.ml b/src/not-so-smart/smart_git.ml
index a5a853b57..211f2896a 100644
--- a/src/not-so-smart/smart_git.ml
+++ b/src/not-so-smart/smart_git.ml
@@ -312,8 +312,7 @@ struct
   module Fetch = Nss.Fetch.Make (Scheduler) (Lwt) (Flow) (Uid) (Ref)
   module Push = Nss.Push.Make (Scheduler) (Lwt) (Flow) (Uid) (Ref)
 
-  let fetch_v1 ?(uses_git_transport = false)
-      ?(verify = fun _ -> Lwt.return_ok ()) ~push_stdout ~push_stderr
+  let fetch_v1 ?(uses_git_transport = false) ~push_stdout ~push_stderr
       ~capabilities path ~ctx ?deepen ?want host store access fetch_cfg pack =
     let open Lwt.Infix in
     Log.debug (fun m -> m "Try to resolve %a." Domain_name.pp host);
@@ -321,26 +320,20 @@ struct
     | Error _ as err ->
         pack None;
         Lwt.return err
-    | Ok flow -> (
-        verify flow >>= function
-        | Error err ->
-            Mimic.close flow >>= fun () ->
+    | Ok flow ->
+        Lwt.try_bind
+          (fun () ->
+            Fetch.fetch_v1 ~uses_git_transport ~push_stdout ~push_stderr
+              ~capabilities ?deepen ?want ~host path (Flow.make flow) store
+              access fetch_cfg (fun (payload, off, len) ->
+                let v = String.sub payload off len in
+                pack (Some (v, 0, len))))
+          (fun refs ->
             pack None;
-            Lwt.return_error err
-        | Ok () ->
-            Lwt.try_bind
-              (fun () ->
-                Fetch.fetch_v1 ~uses_git_transport ~push_stdout ~push_stderr
-                  ~capabilities ?deepen ?want ~host path (Flow.make flow) store
-                  access fetch_cfg (fun (payload, off, len) ->
-                    let v = String.sub payload off len in
-                    pack (Some (v, 0, len))))
-              (fun refs ->
-                pack None;
-                Mimic.close flow >>= fun () -> Lwt.return_ok refs)
-              (fun exn ->
-                pack None;
-                Mimic.close flow >>= fun () -> Lwt.fail exn))
+            Mimic.close flow >>= fun () -> Lwt.return_ok refs)
+          (fun exn ->
+            pack None;
+            Mimic.close flow >>= fun () -> Lwt.fail exn)
 
   module Flow_http = struct
     type +'a fiber = 'a Lwt.t
@@ -410,9 +403,9 @@ struct
     ]
 
   let fetch ?(push_stdout = ignore) ?(push_stderr = ignore) ~ctx
-      ?(verify = fun _ _ -> Lwt.return_ok ()) (access, light_load, heavy_load)
-      store edn ?(version = `V1) ?(capabilities = default_capabilities) ?deepen
-      want t_pck t_idx ~src ~dst ~idx =
+      (access, light_load, heavy_load) store edn ?(version = `V1)
+      ?(capabilities = default_capabilities) ?deepen want t_pck t_idx ~src ~dst
+      ~idx =
     let open Rresult in
     let open Lwt.Infix in
     let host = edn.Endpoint.host in
@@ -437,8 +430,8 @@ struct
           let run () =
             Lwt.both
               (fetch_v1 ~push_stdout ~push_stderr ~uses_git_transport
-                 ~verify:(verify edn) ~capabilities path ~ctx ?deepen ~want host
-                 store access fetch_cfg pusher)
+                 ~capabilities path ~ctx ?deepen ~want host store access
+                 fetch_cfg pusher)
               (run ~light_load ~heavy_load stream t_pck t_idx ~src ~dst ~idx)
             >>= fun (refs, idx) ->
             match refs, idx with
@@ -574,20 +567,16 @@ struct
     Lwt.async fiber;
     stream
 
-  let push ?prelude ~ctx ?(verify = fun _ -> Lwt.return_ok ()) ~capabilities
-      path cmds endpoint store access push_cfg pack =
+  let push ?prelude ~ctx ~capabilities path cmds endpoint store access push_cfg
+      pack =
     let open Lwt.Infix in
     Mimic.resolve ctx >>? fun flow ->
-    verify flow >>= function
-    | Error _ as err -> Mimic.close flow >>= fun () -> Lwt.return err
-    | Ok () ->
-        Push.push ?prelude ~capabilities cmds ~host:endpoint path
-          (Flow.make flow) store access push_cfg pack
-        >>= fun () ->
-        Mimic.close flow >>= fun () -> Lwt.return_ok ()
-
-  let push ~ctx ?(verify = fun _ _ -> Lwt.return_ok ())
-      (access, light_load, heavy_load) store edn ?(version = `V1)
+    Push.push ?prelude ~capabilities cmds ~host:endpoint path (Flow.make flow)
+      store access push_cfg pack
+    >>= fun () ->
+    Mimic.close flow >>= fun () -> Lwt.return_ok ()
+
+  let push ~ctx (access, light_load, heavy_load) store edn ?(version = `V1)
       ?(capabilities = default_capabilities) cmds =
     let open Rresult in
     match version, edn.Endpoint.scheme with
@@ -597,8 +586,7 @@ struct
         let path = edn.path in
         let push_cfg = Nss.Push.configuration () in
         let run () =
-          push ~prelude ~ctx ~verify:(verify edn) ~capabilities path cmds host
-            store access push_cfg
+          push ~prelude ~ctx ~capabilities path cmds host store access push_cfg
             (pack ~light_load ~heavy_load)
         in
         Lwt.catch run (function
diff --git a/src/not-so-smart/smart_git.mli b/src/not-so-smart/smart_git.mli
index 938a2abaa..7906ab407 100644
--- a/src/not-so-smart/smart_git.mli
+++ b/src/not-so-smart/smart_git.mli
@@ -77,7 +77,6 @@ module Make
     ?push_stdout:(string -> unit) ->
     ?push_stderr:(string -> unit) ->
     ctx:Mimic.ctx ->
-    ?verify:(Endpoint.t -> Mimic.flow -> (unit, 'err) result Lwt.t) ->
     (Uid.t, _, Uid.t * int ref * int64, 'g, Scheduler.t) Sigs.access
     * Uid.t Carton_lwt.Thin.light_load
     * Uid.t Carton_lwt.Thin.heavy_load ->
@@ -99,7 +98,6 @@ module Make
 
   val push :
     ctx:Mimic.ctx ->
-    ?verify:(Endpoint.t -> Mimic.flow -> (unit, 'err) result Lwt.t) ->
     (Uid.t, Ref.t, Uid.t Pck.t, 'g, Scheduler.t) Sigs.access
     * Uid.t Carton_lwt.Thin.light_load
     * Uid.t Carton_lwt.Thin.heavy_load ->
diff --git a/unikernel/unikernel.ml b/unikernel/unikernel.ml
index b4eb12809..cf5f8fcf6 100644
--- a/unikernel/unikernel.ml
+++ b/unikernel/unikernel.ml
@@ -25,7 +25,7 @@ struct
       | Smart_git.Endpoint.{ scheme= `SSH _; _ } ->
         if is_ssh flow then Lwt.return_ok () else Lwt.return_error (`Exn Invalid_flow)
       | _ -> if not (is_ssh flow) then Lwt.return_ok () else Lwt.return_error (`Exn Invalid_flow) in
-    Sync.fetch ~ctx ~verify edn git ~deepen:(`Depth 1) `All >>= function
+    Sync.fetch ~ctx edn git ~deepen:(`Depth 1) `All >>= function
     | Ok (Some (hash, references)) -> Lwt.return_unit
     | Ok None -> Lwt.return_unit
     | Error err -> Fmt.failwith "%a" Sync.pp_error err