diff --git a/glicid/packages/virtualization.scm b/glicid/packages/virtualization.scm
index 6f9377f..058f130 100644
--- a/glicid/packages/virtualization.scm
+++ b/glicid/packages/virtualization.scm
@@ -11,97 +11,34 @@
 )
 
 
-(define-public qemu-7.0-upstream
-  (package
-    (inherit qemu)
-    (name "qemu-upstream")
-    (version "7.0.0")
-    (source (origin
-      (method url-fetch)
-      (uri (string-append "https://download.qemu.org/qemu-" version ".tar.xz"))
-      (sha256 (base32 "0fgq8szlc75ymgpxpkj47njqqiw65nxsl2wbg4188whzjp3pbczn"))
-      (patches (search-patches
-        "qemu-build-info-manual.patch"
-        "qemu-fix-agent-paths.patch"
-      ))
-      (modules '((guix build utils)))
-      (snippet
-        '(begin
-           ;; Delete the bundled meson copy.
-           (delete-file-recursively "meson")
-        )
-      )
-    ))
-  )
-)
 
+;(define local-qemu qemu-7.0-upstream)
 
-(define-public qemu-7.1-upstream
-  (package
-    (inherit qemu)
-    (name "qemu-upstream")
-    (version "7.1.0")
-    (source (origin
-      (method url-fetch)
-      (uri (string-append "https://download.qemu.org/qemu-" version ".tar.xz"))
-      (sha256 (base32 "1rmvrgqjhrvcmchnz170dxvrrf14n6nm39y8ivrprmfydd9lwqx0"))
-      (patches (search-patches
-        "qemu-build-info-manual.patch"
-        "qemu-fix-agent-paths.patch"
-      ))
-      (modules '((guix build utils)))
-      (snippet
-        '(begin
-           ;; Delete the bundled meson copy.
-           (delete-file-recursively "meson")
-        )
-      )
-    ))
-  )
-)
+;(define qemu-latest (latest-version local-qemu qemu))
 
-(define-public qemu-minimal-7.0-upstream
-  (package
-    (inherit qemu-minimal)
-    (name "qemu-minimal-upstream")
-    (version "7.0.0")
-    (source (origin
-      (method url-fetch)
-      (uri (string-append "https://download.qemu.org/qemu-" version ".tar.xz"))
-      (sha256 (base32 "0fgq8szlc75ymgpxpkj47njqqiw65nxsl2wbg4188whzjp3pbczn"))
-      (patches (search-patches
-        "qemu-build-info-manual.patch"
-        "qemu-fix-agent-paths.patch"
-      ))
-      (modules '((guix build utils)))
-      (snippet
-        '(begin
-           ;; Delete the bundled meson copy.
-           (delete-file-recursively "meson")
-        )
-      )
-    ))
-  )
-)
+;(define local-qemu-minimal qemu-minimal-7.0-upstream)
 
-(define local-qemu qemu-7.0-upstream)
+;(define qemu-minimal-latest (latest-version local-qemu-minimal qemu-minimal))
 
-(define qemu-latest (latest-version local-qemu qemu))
+;; current guix version is latest.
+(define qemu-latest qemu)
+(define qemu-minimal-latest qemu-minimal)
 
-(define local-qemu-minimal qemu-minimal-7.0-upstream)
-
-(define qemu-minimal-latest (latest-version local-qemu-minimal qemu-minimal))
 
 (define-public qemu-with-rbd
   (package
     (inherit qemu-latest) 
     (name "qemu-with-rbd")
+
     (arguments
-      (substitute-keyword-arguments `(
-        #:tests? #f
-        ,@(package-arguments qemu)
-      ))
-    ) 
+     (substitute-keyword-arguments (package-arguments qemu)
+       ((#:tests? _ #f)
+        ;; FIXME: To run the test suite, fix all the instances where scripts
+        ;; generates "#! /bin/sh" shebangs.
+        #f)
+      )
+    )    
+
     (inputs `(
       ("ceph:lib", ceph "lib")
       ,@(package-inputs qemu)
@@ -109,6 +46,25 @@
   )
 )
 
+
+;(define-public qemu-with-rbd
+;  (package
+;    (inherit qemu-latest) 
+;    (name "qemu-with-rbd")
+;    (arguments
+;      (substitute-keyword-arguments `(
+;        #:tests? #f
+;        ,@(package-arguments qemu)
+;      ))
+;    ) 
+;    (inputs `(
+;      ("ceph:lib", ceph "lib")
+;      ,@(package-inputs qemu)
+;    ))
+;  )
+;)
+
+
 (define-public qemu-minimal-with-rbd
   (package
     (inherit qemu-minimal-latest)