diff --git a/pkg/util/querylimits/limiter.go b/pkg/util/querylimits/limiter.go
index ddf2665242..ab94c2a896 100644
--- a/pkg/util/querylimits/limiter.go
+++ b/pkg/util/querylimits/limiter.go
@@ -2,7 +2,6 @@ package querylimits
 
 import (
 	"context"
-	"fmt"
 	"time"
 
 	"github.com/go-kit/log"
@@ -30,11 +29,9 @@ func (l *Limiter) MaxQueryLength(ctx context.Context, userID string) time.Durati
 	requestLimits := ExtractQueryLimitsContext(ctx)
 	if requestLimits == nil || requestLimits.MaxQueryLength == 0 || time.Duration(requestLimits.MaxQueryLength) > original {
 		level.Debug(logutil.WithContext(ctx, l.logger)).Log("msg", "using original limit")
-		fmt.Printf("using original limit, passed limits %v\n", requestLimits)
 		return original
 	}
 	level.Debug(logutil.WithContext(ctx, l.logger)).Log("msg", "using request limit", "limit", requestLimits.MaxQueryLength)
-	fmt.Printf("using request limit %d\n", requestLimits.MaxQueryLength)
 	return time.Duration(requestLimits.MaxQueryLength)
 }
 
diff --git a/pkg/util/querylimits/propagation.go b/pkg/util/querylimits/propagation.go
index 88a0b6ce3c..4d8cf17e03 100644
--- a/pkg/util/querylimits/propagation.go
+++ b/pkg/util/querylimits/propagation.go
@@ -3,7 +3,6 @@ package querylimits
 import (
 	"context"
 	"encoding/json"
-	"fmt"
 	"net/http"
 
 	"github.com/prometheus/common/model"
@@ -66,7 +65,6 @@ func ExtractQueryLimitsHTTP(r *http.Request) (*QueryLimits, error) {
 // ExtractQueryLimitsContext gets the embedded limits from the context
 func ExtractQueryLimitsContext(ctx context.Context) *QueryLimits {
 	source, ok := ctx.Value(queryLimitsContextKey).(*QueryLimits)
-	fmt.Printf("extracted limits from context: %v\n", source)
 
 	if !ok {
 		return nil
@@ -77,6 +75,5 @@ func ExtractQueryLimitsContext(ctx context.Context) *QueryLimits {
 
 // InjectQueryLimitsContext returns a derived context containing the provided query limits
 func InjectQueryLimitsContext(ctx context.Context, limits QueryLimits) context.Context {
-	fmt.Printf("inject limits into context: %v\n", limits)
 	return context.WithValue(ctx, interface{}(queryLimitsContextKey), &limits)
 }
diff --git a/pkg/util/querylimits/tripperware.go b/pkg/util/querylimits/tripperware.go
index 9ee163de5e..a7608b9895 100644
--- a/pkg/util/querylimits/tripperware.go
+++ b/pkg/util/querylimits/tripperware.go
@@ -1,7 +1,6 @@
 package querylimits
 
 import (
-	"fmt"
 	"net/http"
 
 	"github.com/grafana/loki/pkg/querier/queryrange/queryrangebase"
@@ -27,7 +26,6 @@ func (t *tripperwareWrapper) RoundTrip(r *http.Request) (*http.Response, error)
 	ctx := r.Context()
 
 	limits := ExtractQueryLimitsContext(ctx)
-	fmt.Printf("extract limits tripperware %v", limits)
 
 	if limits != nil {
 		ctx = InjectQueryLimitsContext(ctx, *limits)
@@ -41,7 +39,6 @@ func (t *tripperwareWrapper) PostWrappedRoundTrip(r *http.Request) (*http.Respon
 	ctx := r.Context()
 
 	limits := ExtractQueryLimitsContext(ctx)
-	fmt.Printf("extract limits tripperware %v", limits)
 
 	if limits != nil {
 		err := InjectQueryLimitsHTTP(r, limits)
diff --git a/tools/dev/loki-boltdb-storage-s3/config/datasource.yaml b/tools/dev/loki-boltdb-storage-s3/config/datasource.yaml
index 25731808b9..4448583ad7 100644
--- a/tools/dev/loki-boltdb-storage-s3/config/datasource.yaml
+++ b/tools/dev/loki-boltdb-storage-s3/config/datasource.yaml
@@ -12,3 +12,13 @@ datasources:
       httpHeaderName1: 'X-Scope-OrgID'
     secureJsonData:
       httpHeaderValue1: '1'
+  - name: Loki-Limited
+    type: loki
+    access: proxy
+    url: http://query-frontend:8007
+    jsonData:
+      httpHeaderName1: 'X-Scope-OrgID'
+      httpHeaderName2: 'X-Loki-Query-Limits'
+    secureJsonData:
+      httpHeaderValue1: '1'
+      httpHeaderValue2: '{"maxQueryLength":"30m"}'
diff --git a/tools/dev/loki-boltdb-storage-s3/config/loki.yaml b/tools/dev/loki-boltdb-storage-s3/config/loki.yaml
index d2d9b3faef..c54dbcc10c 100644
--- a/tools/dev/loki-boltdb-storage-s3/config/loki.yaml
+++ b/tools/dev/loki-boltdb-storage-s3/config/loki.yaml
@@ -1,4 +1,6 @@
 auth_enabled: true 
+common:
+    compactor_address: compactor:8006
 chunk_store_config:
     chunk_cache_config:
         memcached: